diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-09 14:10:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-09 14:10:27 +0200 |
| commit | ca732a52dcd5531347ed36809eec26b0ed159703 (patch) | |
| tree | 5c882ed08dfaae394eca0166731b844aeac1afe7 | |
| parent | 1c6058a5bc3db61aa12c3fae11b216828e2bc5a5 (diff) | |
| parent | af35130b50c3238e82aa3b43fbc983fd7e4daf50 (diff) | |
Merge pull request #6693 from J08nY/issue-editor-only-light
light: respect editor_only setting in release build, fixes #6665
| -rw-r--r-- | scene/3d/light.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 227bb3a59d..5b221d1574 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -446,6 +446,10 @@ bool editor_ok=true; editor_ok = (get_tree()->get_edited_scene_root() && (this==get_tree()->get_edited_scene_root() || get_owner()==get_tree()->get_edited_scene_root())); } } +#else + if (editor_only) { + editor_ok=false; + } #endif VS::get_singleton()->instance_light_set_enabled(get_instance(),is_visible() && enabled && editor_ok); @@ -672,5 +676,3 @@ void SpotLight::_bind_methods() { ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/spot_attenuation", PROPERTY_HINT_EXP_EASING, "spot_attenuation"), _SCS("set_parameter"), _SCS("get_parameter"), PARAM_SPOT_ATTENUATION ); } - - |