diff options
| author | Ignacio Etcheverry <neikeq@users.noreply.github.com> | 2017-08-14 22:16:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 22:16:39 +0200 |
| commit | 7fc3c51169957f0907a13dd07d4004496e6ebd56 (patch) | |
| tree | cfae1a395557040d4f570211c717a2da0d0c5351 /scene | |
| parent | b7571582ed95e1a7530e6b4251d99098e4175cc6 (diff) | |
| parent | 4b0990bf8d9351ee213c6596725c2667ab91d033 (diff) | |
Merge pull request #10339 from bojidar-bg/x-fix-scale-conflict
Rename Light2D::scale to texture_scale, so it doesn't conflict
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/light_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index e8c2122bd1..ffe69fa93f 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -416,7 +416,7 @@ void Light2D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editor_only"), "set_editor_only", "is_editor_only"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset"), "set_texture_offset", "get_texture_offset"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "scale", PROPERTY_HINT_RANGE, "0.01,50,0.01"), "set_texture_scale", "get_texture_scale"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "texture_scale", PROPERTY_HINT_RANGE, "0.01,50,0.01"), "set_texture_scale", "get_texture_scale"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "energy", PROPERTY_HINT_RANGE, "0.01,100,0.01"), "set_energy", "get_energy"); ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Add,Sub,Mix,Mask"), "set_mode", "get_mode"); |