svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / editors / space_api / spacetypes.c
index 89693b6cc2c7fc87b29b1d7a1feceb1faf709b08..510103895f4103a338b56dfc8085446765d6ca3a 100644 (file)
 #include "BIF_gl.h"
 
 #include "ED_anim_api.h"
+#include "ED_armature.h"
+#include "ED_curve.h"
 #include "ED_mesh.h"
+#include "ED_markers.h"
 #include "ED_object.h"
+#include "ED_particle.h"
 #include "ED_sculpt.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"
 #include "ED_uvedit.h"
-
-ARegionType *ED_regiontype_from_id(SpaceType *st, int regionid)
-{
-       ARegionType *art;
-       
-       for(art= st->regiontypes.first; art; art= art->next)
-               if(art->regionid==regionid)
-                       return art;
-       
-       printf("Error, region type missing in %s\n", st->name);
-       return st->regiontypes.first;
-}
-
+#include "ED_pointcache.h"
 
 /* only call once on startup, storage is global in BKE kernel listbase */
 void ED_spacetypes_init(void)
@@ -82,6 +74,7 @@ void ED_spacetypes_init(void)
        ED_spacetype_script();
        ED_spacetype_text();
        ED_spacetype_sequencer();
+       ED_spacetype_logic();
 //     ...
        
        /* register operator types for screen and all spaces */
@@ -92,6 +85,13 @@ void ED_spacetypes_init(void)
        ED_operatortypes_mesh();
        ED_operatortypes_sculpt();
        ED_operatortypes_uvedit();
+       ED_operatortypes_paint();
+       ED_operatortypes_particle();
+       ED_operatortypes_curve();
+       ED_operatortypes_armature();
+       ED_marker_operatortypes();
+       ED_operatortypes_pointcache();
+       
        ui_view2d_operatortypes();
        
        spacetypes = BKE_spacetypes_list();
@@ -114,6 +114,11 @@ void ED_spacetypes_keymap(wmWindowManager *wm)
        ED_keymap_object(wm);
        ED_keymap_mesh(wm);
        ED_keymap_uvedit(wm);
+       ED_keymap_curve(wm);
+       ED_keymap_armature(wm);
+       ED_keymap_particle(wm);
+       ED_marker_keymap(wm);
+
        UI_view2d_keymap(wm);
 
        spacetypes = BKE_spacetypes_list();