diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-09 19:03:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 19:03:23 +0100 |
| commit | 45f7fc46f8066d8e3a460ed2ce1a2facf624abcd (patch) | |
| tree | 231423b7cc16900e0f842ff6ac1bd62789708d67 | |
| parent | 8a4cec21ca5297d8a0cc9082f86ba12bec1e0915 (diff) | |
| parent | cae50c7f1d5c2834324b9d30562737463acfb27b (diff) | |
Merge pull request #14455 from RayKoopa/remove_layer_flyout_label
Remove physics / render layer flyout label.
| -rw-r--r-- | editor/property_editor.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index eed1efaf9c..446a0ea35d 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -430,24 +430,19 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: } else if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER) { - String title; String basename; switch (hint) { case PROPERTY_HINT_LAYERS_2D_RENDER: basename = "layer_names/2d_render"; - title = "2D Render Layers"; break; case PROPERTY_HINT_LAYERS_2D_PHYSICS: basename = "layer_names/2d_physics"; - title = "2D Physics Layers"; break; case PROPERTY_HINT_LAYERS_3D_RENDER: basename = "layer_names/3d_render"; - title = "3D Render Layers"; break; case PROPERTY_HINT_LAYERS_3D_PHYSICS: basename = "layer_names/3d_physics"; - title = "3D Physics Layers"; break; } @@ -469,11 +464,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: show(); - value_label[0]->set_text(title); - value_label[0]->show(); - value_label[0]->set_position(Vector2(4, 4) * EDSCALE); - - checks20gc->set_position(Vector2(4, 4) * EDSCALE + Vector2(0, value_label[0]->get_size().height + 4 * EDSCALE)); + checks20gc->set_position(Vector2(4, 4) * EDSCALE); checks20gc->set_size(checks20gc->get_minimum_size()); set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_position() + checks20gc->get_size()); |