History

Merge remote-tracking branch 'overte/master' into master_to_protocol_changes3

HifiExperiments committed 2 years ago

Commit 8fc734b2 parents 0ab9d5f 493c9c99 files · +82 −11Browse files

Showing the changes to interface/src/scripting/RenderScriptingInterface.cpp (1 of 9 files). Show all

Unified · Split

interface/src/scripting/RenderScriptingInterface.cpp+2−2
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include <QScreen>
1717 #include "ScreenName.h"
1818
19−#include <MeshPartPayload.h>
19+#include <procedural/Procedural.h>
2020
2121 STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
2222 auto scriptEngine = manager->engine().get();
@@ -252,7 +252,7 @@ void RenderScriptingInterface::forceProceduralMaterialsEnabled(bool enabled) { · 229 unmodified lines
252252 _proceduralMaterialsEnabledSetting.set(enabled);
253253
254254 Menu::getInstance()->setIsOptionChecked(MenuOption::MaterialProceduralShaders, enabled);
255− ModelMeshPartPayload::enableMaterialProceduralShaders = enabled;
255+ Procedural::enableProceduralShaders = enabled;
256256 });
257257 }
258258