Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / space_api / spacetypes.c
index edd5da4..041e6a0 100644 (file)
@@ -42,7 +42,6 @@
 #include "ED_anim_api.h"
 #include "ED_armature.h"
 #include "ED_curve.h"
-#include "ED_gpencil.h"
 #include "ED_markers.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
@@ -51,7 +50,6 @@
 #include "ED_screen.h"
 #include "ED_sculpt.h"
 #include "ED_space_api.h"
-#include "ED_sound.h"
 #include "ED_uvedit.h"
 #include "ED_mball.h"
 
@@ -85,8 +83,7 @@ void ED_spacetypes_init(void)
        /* register operator types for screen and all spaces */
        ED_operatortypes_screen();
        ED_operatortypes_anim();
-       ED_operatortypes_animchannels();
-       ED_operatortypes_gpencil();
+       ED_operatortypes_animchannels(); // XXX have this as part of anim() ones instead?
        ED_operatortypes_object();
        ED_operatortypes_mesh();
        ED_operatortypes_sculpt();
@@ -100,7 +97,6 @@ void ED_spacetypes_init(void)
        ED_operatortypes_fluid();
        ED_operatortypes_metaball();
        ED_operatortypes_boids();
-       ED_operatortypes_sound();
        
        ui_view2d_operatortypes();
        
@@ -121,7 +117,6 @@ void ED_spacetypes_keymap(wmWindowManager *wm)
        ED_keymap_screen(wm);
        ED_keymap_anim(wm);
        ED_keymap_animchannels(wm);
-       ED_keymap_gpencil(wm);
        ED_keymap_object(wm);
        ED_keymap_mesh(wm);
        ED_keymap_uvedit(wm);