diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-10 15:30:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 15:30:28 +0100 |
| commit | b7915b3ea2e4364d2338a1e130609974571d2100 (patch) | |
| tree | f6b4c80478825e5102c41bee268a53ac584f94f1 /scene | |
| parent | 98568437179cc65d7ce90372f1d7f7db4ebdfd56 (diff) | |
| parent | b8ea0ba9842a4b7b9e58ef00c7f30f338f4a1ddb (diff) | |
Merge pull request #7482 from volzhs/modulate-color
Fix modulate property bind to Color
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/canvas_item.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 1f4804990f..611e7540c1 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -1005,8 +1005,8 @@ void CanvasItem::_bind_methods() { ADD_GROUP("Visibility",""); ADD_PROPERTYNO( PropertyInfo(Variant::BOOL,"visible"), _SCS("_set_visible_"),_SCS("_is_visible_") ); - ADD_PROPERTYNO( PropertyInfo(Variant::REAL,"modulate",PROPERTY_HINT_RANGE, "0,1,0.01"), _SCS("set_modulate"),_SCS("get_modulate") ); - ADD_PROPERTYNO( PropertyInfo(Variant::REAL,"self_modulate",PROPERTY_HINT_RANGE, "0,1,0.01"), _SCS("set_self_modulate"),_SCS("get_self_modulate") ); + ADD_PROPERTYNO( PropertyInfo(Variant::COLOR,"modulate"), _SCS("set_modulate"),_SCS("get_modulate") ); + ADD_PROPERTYNO( PropertyInfo(Variant::COLOR,"self_modulate"), _SCS("set_self_modulate"),_SCS("get_self_modulate") ); ADD_PROPERTYNZ( PropertyInfo(Variant::BOOL,"show_behind_parent"), _SCS("set_draw_behind_parent"),_SCS("is_draw_behind_parent_enabled") ); ADD_PROPERTY( PropertyInfo(Variant::BOOL,"show_on_top",PROPERTY_HINT_NONE,"",0), _SCS("_set_on_top"),_SCS("_is_on_top") ); //compatibility ADD_PROPERTYNO( PropertyInfo(Variant::INT,"light_mask",PROPERTY_HINT_ALL_FLAGS), _SCS("set_light_mask"),_SCS("get_light_mask") ); |