History

working on parenting fixes

HifiExperiments committed 6 years ago

Commit eb26d9b1 parent 243309f39 files · +134 −103Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 39 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+7−5
@@ -282,11 +282,6 @@ void Model::setRenderItemsNeedUpdate() { · 281 unmodified lines
282282 emit requestRenderUpdate();
283283 }
284284
285−void Model::setPrimitiveMode(PrimitiveMode primitiveMode) {
286− _primitiveMode = primitiveMode;
287− setRenderItemsNeedUpdate();
288−}
289−
290285 void Model::reset() {
291286 if (isLoaded()) {
292287 const HFMModel& hfmModel = getHFMModel();
@@ -888,6 +883,13 @@ void Model::updateRenderItemsKey(const render::ScenePointer& scene) { · 595 unmodified lines
888883 scene->enqueueTransaction(transaction);
889884 }
890885
886+void Model::setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene) {
887+ if (_primitiveMode != primitiveMode) {
888+ _primitiveMode = primitiveMode;
889+ updateRenderItemsKey(scene);
890+ }
891+}
892+
891893 void Model::setVisibleInScene(bool visible, const render::ScenePointer& scene) {
892894 if (Model::isVisible() != visible) {
893895 auto keyBuilder = render::ItemKey::Builder(_renderItemKeyGlobalFlags);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t