diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-09 18:27:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-09 18:27:29 +0200 |
| commit | d23d40cfbdb1033848f89a2896701b792ef5e5ad (patch) | |
| tree | 4fbb52458e7a6910f2d790bd8ce84983cd136945 | |
| parent | 1d6be8b00d9c46ca748f9465864ce74487c6bc88 (diff) | |
| parent | 7cad11e1083c8ceb07c415ccb36eb4596b66384f (diff) | |
Merge pull request #5612 from TheHX/collision-polygon-plugin
Fix CollisionPolygon gizmo showing error icons instead of the 3d handles
| -rw-r--r-- | tools/editor/plugins/collision_polygon_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_editor_plugin.cpp index 55e38cebcc..0b06b3ba21 100644 --- a/tools/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_editor_plugin.cpp @@ -584,7 +584,7 @@ CollisionPolygonEditor::CollisionPolygonEditor(EditorNode *p_editor) { handle_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1)); handle_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true); handle_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, false); - Ref<Texture> handle= SpatialEditor::get_singleton()->get_icon("Editor3DHandle","EditorIcons"); + Ref<Texture> handle=editor->get_gui_base()->get_icon("Editor3DHandle","EditorIcons"); handle_material->set_point_size(handle->get_width()); handle_material->set_texture(FixedMaterial::PARAM_DIFFUSE,handle); |