diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-09-04 07:48:14 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-09-04 07:49:42 -0300 |
commit | 6d233c651b21ecaef78fbb20d0365a22919b72b1 (patch) | |
tree | a8be9cc8446853e7d0ad5a017ce4916145175a23 /editor/plugins | |
parent | 3873362b3df0c1c03746225f8e43b629bd0864cc (diff) |
-Changed KinematicBody API yet again to make it friendlier
-Fixed get_scale functions (and added set_scale) to make it more coherent when decomposing and composing (fixes bugs in transform interpolation)
Diffstat (limited to 'editor/plugins')
-rw-r--r-- | editor/plugins/cube_grid_theme_editor_plugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/plugins/cube_grid_theme_editor_plugin.cpp b/editor/plugins/cube_grid_theme_editor_plugin.cpp index decf8b2bb4..1c17daf425 100644 --- a/editor/plugins/cube_grid_theme_editor_plugin.cpp +++ b/editor/plugins/cube_grid_theme_editor_plugin.cpp @@ -111,7 +111,8 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, sb->get_shape_owners(&shapes); for (List<uint32_t>::Element *E = shapes.front(); E; E = E->next()) { - if (sb->is_shape_owner_disabled(E->get())) continue; + if (sb->is_shape_owner_disabled(E->get())) + continue; //Transform shape_transform = sb->shape_owner_get_transform(E->get()); @@ -120,7 +121,7 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, for (int k = 0; k < sb->shape_owner_get_shape_count(E->get()); k++) { Ref<Shape> collision = sb->shape_owner_get_shape(E->get(), k); - if (collision.is_valid()) + if (!collision.is_valid()) continue; MeshLibrary::ShapeData shape_data; shape_data.shape = collision; |