diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:16:00 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:16:00 -0300 |
| commit | b307ee79a13e2c34973fd5a1861cf458d7c7da8c (patch) | |
| tree | 757d12bd8c7769346aed78ad5335758d55545341 | |
| parent | 5ed26002798466dd6388f291bb69d78e72526e19 (diff) | |
| parent | 103ab3bd1a1974655766dc42768f6e603b237c1a (diff) | |
Merge pull request #1574 from UsernameIsAReservedWord/fix_3d_spot_attenuation
fixes_3d_spot_attenuation
| -rw-r--r-- | scene/3d/light.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/light.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 15e77e5378..037350f99a 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -669,7 +669,7 @@ void SpotLight::_bind_methods() { ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/attenuation", PROPERTY_HINT_EXP_EASING, "attenuation"), _SCS("set_parameter"), _SCS("get_parameter"), PARAM_ATTENUATION ); ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/spot_angle", PROPERTY_HINT_RANGE, "0.01,89.9,0.01"), _SCS("set_parameter"), _SCS("get_parameter"), PARAM_SPOT_ANGLE ); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/spot_attenuation", PROPERTY_HINT_EXP_EASING, "attenuation"), _SCS("set_parameter"), _SCS("get_parameter"), PARAM_SPOT_ATTENUATION ); + ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/spot_attenuation", PROPERTY_HINT_EXP_EASING, "spot_attenuation"), _SCS("set_parameter"), _SCS("get_parameter"), PARAM_SPOT_ATTENUATION ); } diff --git a/scene/3d/light.h b/scene/3d/light.h index 6fb57a269b..5b10a4d816 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -49,7 +49,7 @@ public: PARAM_ENERGY=VisualServer::LIGHT_PARAM_ENERGY, PARAM_ATTENUATION=VisualServer::LIGHT_PARAM_ATTENUATION, PARAM_SPOT_ANGLE=VisualServer::LIGHT_PARAM_SPOT_ANGLE, - PARAM_SPOT_ATTENUATION=VisualServer::LIGHT_PARAM_ATTENUATION, + PARAM_SPOT_ATTENUATION=VisualServer::LIGHT_PARAM_SPOT_ATTENUATION, PARAM_SHADOW_DARKENING=VisualServer::LIGHT_PARAM_SHADOW_DARKENING, PARAM_SHADOW_Z_OFFSET=VisualServer::LIGHT_PARAM_SHADOW_Z_OFFSET, PARAM_SHADOW_Z_SLOPE_SCALE=VisualServer::LIGHT_PARAM_SHADOW_Z_SLOPE_SCALE, |