diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-08-29 17:01:33 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-29 17:01:33 -0300 |
| commit | 3a3c94bec80d192374758daa05013b9bc96660db (patch) | |
| tree | 7952648e7e0a6e8759958299921b4de146d7cf6a /editor/editor_properties.cpp | |
| parent | f27fa5139d05e3b85707b0e0eafd160adca423ff (diff) | |
| parent | 07707a3627b09544e5f6ac5821a9367e1c654707 (diff) | |
Merge pull request #52235 from godotengine/revert-47635-node2d3d-transform
Revert "Display a matrix for Node2D and don't display a duplicate origin"
Diffstat (limited to 'editor/editor_properties.cpp')
| -rw-r--r-- | editor/editor_properties.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index d1380e928a..cb7fffe592 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2268,7 +2268,7 @@ void EditorPropertyTransform2D::setup(double p_min, double p_max, double p_step, } } -EditorPropertyTransform2D::EditorPropertyTransform2D(bool p_include_origin) { +EditorPropertyTransform2D::EditorPropertyTransform2D() { GridContainer *g = memnew(GridContainer); g->set_columns(2); add_child(g); @@ -2278,9 +2278,7 @@ EditorPropertyTransform2D::EditorPropertyTransform2D(bool p_include_origin) { spin[i] = memnew(EditorSpinSlider); spin[i]->set_label(desc[i]); spin[i]->set_flat(true); - if (p_include_origin || i < 4) { - g->add_child(spin[i]); - } + g->add_child(spin[i]); spin[i]->set_h_size_flags(SIZE_EXPAND_FILL); add_focusable(spin[i]); spin[i]->connect("value_changed", callable_mp(this, &EditorPropertyTransform2D::_value_changed), varray(desc[i])); @@ -3287,7 +3285,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_ } break; case Variant::TRANSFORM2D: { - EditorPropertyTransform2D *editor = memnew(EditorPropertyTransform2D(p_usage != PROPERTY_USAGE_EDITOR)); + EditorPropertyTransform2D *editor = memnew(EditorPropertyTransform2D); EditorPropertyRangeHint hint = _parse_range_hint(p_hint, p_hint_text, default_float_step); editor->setup(hint.min, hint.max, hint.step, hint.hide_slider, hint.suffix); return editor; |