Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge issue

Browse source
This commit is contained in:
HifiExperiments 2020-08-04 08:54:44 -07:00
parent 0d62798860
commit 87fd039f99
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/render-utils/src/Model.cpp
View file

@ -886,13 +886,6 @@ void Model::updateRenderItemsKey(const render::ScenePointer& scene) {
scene->enqueueTransaction(transaction); scene->enqueueTransaction(transaction);
} }
void Model::setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene) {
if (_primitiveMode != primitiveMode) {
_primitiveMode = primitiveMode;
updateRenderItemsKey(scene);
}
}
void Model::setVisibleInScene(bool visible, const render::ScenePointer& scene) { void Model::setVisibleInScene(bool visible, const render::ScenePointer& scene) {
if (Model::isVisible() != visible) { if (Model::isVisible() != visible) {
auto keyBuilder = render::ItemKey::Builder(_renderItemKeyGlobalFlags); auto keyBuilder = render::ItemKey::Builder(_renderItemKeyGlobalFlags);
@ -965,10 +958,10 @@ void Model::setCauterized(bool cauterized, const render::ScenePointer& scene) {
} }
} }
void Model::setPrimitiveMode(PrimitiveMode primitiveMode) { void Model::setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene) {
if (_primitiveMode != primitiveMode) { if (_primitiveMode != primitiveMode) {
_primitiveMode = primitiveMode; _primitiveMode = primitiveMode;
setRenderItemsNeedUpdate(); updateRenderItemsKey(scene);
} }
} }