diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-26 23:38:21 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-26 23:38:21 +0100 |
| commit | d1a07ee28bd9cd8b3962c807021a8e95dffb70f1 (patch) | |
| tree | 972b79893c485b91bba2ef7f98c0553852938bd0 /tools | |
| parent | 82413bd2a1533f31a39de196411be2df0b8f4bad (diff) | |
| parent | 2db2dd66de68e34df2ea4aa174aadb0b1b9b2cc0 (diff) | |
Merge pull request #2891 from TheHX/fix_matrix_property
Fix property editor Matrix3 and Matrix32 editing
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/property_editor.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 31393ebcbc..0fe3dee2ea 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -1361,7 +1361,7 @@ void CustomPropertyEditor::_modified(String p_string) { } break; case Variant::MATRIX32: { - Matrix3 m; + Matrix32 m; for(int i=0;i<6;i++) { m.elements[i/2][i%2]=value_editor[i]->get_text().to_double(); @@ -2846,6 +2846,13 @@ void PropertyEditor::update_tree() { item->set_icon( 0,get_icon("Vector","EditorIcons") ); } break; + case Variant::MATRIX32: + case Variant::MATRIX3: { + + item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); + item->set_editable( 1, true ); + item->set_text(1, obj->get(p.name)); + } break; case Variant::TRANSFORM: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); |