From 6d233c651b21ecaef78fbb20d0365a22919b72b1 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 4 Sep 2017 07:48:14 -0300 Subject: -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) --- editor/plugins/cube_grid_theme_editor_plugin.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'editor/plugins') 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 p_library, sb->get_shape_owners(&shapes); for (List::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 p_library, for (int k = 0; k < sb->shape_owner_get_shape_count(E->get()); k++) { Ref 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; -- cgit v1.2.3