diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-10-16 05:56:25 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-10-16 05:56:25 -0300 |
| commit | 88d64e7735a9b1ba99b3b6a785b394bccda8ea2d (patch) | |
| tree | 722788a254ea1f9629bb818235aaed5d1979aa41 /scene | |
| parent | 371eac9beffdfe416b8555ee006baf0ffae2bef3 (diff) | |
| parent | 3161ceda2f93477164bbb0b1cf4f8b660de2f818 (diff) | |
Merge pull request #798 from marynate/PR-fix-light-in-release-mode
Fix light was always been disabled in release mode (tools=no)
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/3d/light.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 6cf50450ac..e51a9764f6 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -436,9 +436,9 @@ void Light::_update_visibility() { return; +bool editor_ok=true; #ifdef TOOLS_ENABLED - bool editor_ok=true; if (editor_only) { if (!get_scene()->is_editor_hint()) { editor_ok=false; @@ -446,11 +446,8 @@ void Light::_update_visibility() { editor_ok = (get_scene()->get_edited_scene_root() && (this==get_scene()->get_edited_scene_root() || get_owner()==get_scene()->get_edited_scene_root())); } } -#else - bool editor_ok=false; #endif - VS::get_singleton()->instance_light_set_enabled(get_instance(),is_visible() && enabled && editor_ok); _change_notify("geometry/visible"); |