=bmesh= merge from trunk at r36153

2 files changed, 16 insertions, 2 deletions

diff --git a/source/blender/editors/space_api/space.c b/source/blender/editors/space_api/space.c
index bfe47f6e35a..1ba8f00995c 100644
--- a/source/blender/editors/space_api/space.c
+++ b/source/blender/editors/space_api/space.c
@@ -26,6 +26,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/editors/space_api/space.c
+ *  \ingroup spapi
+ */
+
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index db857d4be9f..cb89b92336f 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -22,6 +22,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
+/** \file blender/editors/space_api/spacetypes.c
+ *  \ingroup spapi
+ */
+
+
 #include <stdlib.h>
 
 #include "MEM_guardedalloc.h"
@@ -125,7 +130,9 @@ void ED_spacetypes_init(void)
 	ED_operatormacros_node();
 	ED_operatormacros_object();
 	ED_operatormacros_file();
-
+	ED_operatormacros_graph();
+	ED_operatormacros_action();
+	
 	/* register dropboxes (can use macros) */
 	spacetypes = BKE_spacetypes_list();
 	for(type=spacetypes->first; type; type=type->next) {
@@ -228,6 +235,8 @@ void ED_region_draw_cb_draw(const bContext *C, ARegion *ar, int type)
 
 
 /* ********************* space template *********************** */
+/* forward declare */
+void ED_spacetype_xxx(void);
 
 /* allocate and init some vars */
 static SpaceLink *xxx_new(const bContext *UNUSED(C))
@@ -269,7 +278,7 @@ static void xxx_keymap(wmKeyConfig *UNUSED(keyconf))
 }
 
 /* only called once, from screen/spacetypes.c */
-static void ED_spacetype_xxx(void)
+void ED_spacetype_xxx(void)
 {
 	static SpaceType st;