diff options
| author | Rémi Verschelde | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /tools/editor/scene_tree_editor.cpp | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
| download | godot-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.gz godot-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.zst godot-3f3f5a5359973e95e94148676a9793d6f52468f3.zip | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'tools/editor/scene_tree_editor.cpp')
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index aa74f47e8..e0cc9573c 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -959,7 +959,7 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2& p_point,Control* p_from) Label *label = memnew( Label( selected[i]->get_name() ) ); hb->add_child(label); vb->add_child(hb); - hb->set_opacity(opacity_item); + hb->set_modulate(Color(1,1,1,opacity_item)); opacity_item -= opacity_step; } NodePath p = selected[i]->get_path(); |