diff options
| author | James McLean <james@mcleanlabs.ca> | 2015-06-23 18:22:14 -0400 |
|---|---|---|
| committer | James McLean <james@mcleanlabs.ca> | 2015-06-23 18:22:14 -0400 |
| commit | d23ee8eb017d14c0efb3e07b6437987fd78a0955 (patch) | |
| tree | ef177d20949cb879f4c55c6b159eedd0b03ab83b /tools/editor/editor_node.cpp | |
| parent | 2f882abb65f185adde9d4f569fe9df022babbc40 (diff) | |
| parent | e42aed6ed059b23c100f5a0bc5170831f12400aa (diff) | |
Merge branch 'master' of github.com:okamstudio/godot into development
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index d080ac3597..a513451b48 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -92,6 +92,7 @@ #include "plugins/navigation_polygon_editor_plugin.h" #include "plugins/light_occluder_2d_editor_plugin.h" #include "plugins/color_ramp_editor_plugin.h" +#include "plugins/collision_shape_2d_editor_plugin.h" // end #include "tools/editor/io_plugins/editor_texture_import_plugin.h" #include "tools/editor/io_plugins/editor_scene_import_plugin.h" @@ -3455,6 +3456,7 @@ void EditorNode::register_editor_types() { ObjectTypeDB::register_type<EditorScenePostImport>(); ObjectTypeDB::register_type<EditorScript>(); ObjectTypeDB::register_type<EditorFileDialog>(); + ObjectTypeDB::register_type<UndoRedo>(); //ObjectTypeDB::register_type<EditorImporter>(); @@ -5050,6 +5052,7 @@ EditorNode::EditorNode() { add_editor_plugin( memnew( LightOccluder2DEditorPlugin(this) ) ); add_editor_plugin( memnew( NavigationPolygonEditorPlugin(this) ) ); add_editor_plugin( memnew( ColorRampEditorPlugin(this) ) ); + add_editor_plugin( memnew( CollisionShape2DEditorPlugin(this) ) ); for(int i=0;i<EditorPlugins::get_plugin_count();i++) add_editor_plugin( EditorPlugins::create(i,this) ); |