[Bf-blender-cvs] [b844da7] pie-menus: Code cleanup, move function to correct header
Antony Riakiotakis
noreply at git.blender.org
Wed Jul 30 16:30:05 CEST 2014
Commit: b844da7750327967d750553f6bd6ca8890bb22f7
Author: Antony Riakiotakis
Date: Wed Jul 30 16:29:09 2014 +0200
Branches: pie-menus
https://developer.blender.org/rBb844da7750327967d750553f6bd6ca8890bb22f7
Code cleanup, move function to correct header
===================================================================
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/space_api/spacetypes.c
===================================================================
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 7c0223e..d31be3e 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -122,7 +122,6 @@ bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm);
/* screen keymaps */
void ED_operatortypes_screen(void);
-void ED_operatormacros_view3d(void);
void ED_keymap_screen(struct wmKeyConfig *keyconf);
/* operators; context poll callbacks */
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index b0ea984..ae5218a 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -356,6 +356,8 @@ float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char *
void ED_scene_draw_fps(struct Scene *scene, const struct rcti *rect);
+void ED_operatormacros_view3d(void);
+
/* view matrix properties utilities */
/* unused */
#if 0
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 127fd7c..89a94ca 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -61,6 +61,7 @@
#include "ED_space_api.h"
#include "ED_sound.h"
#include "ED_uvedit.h"
+#include "ED_view3d.h"
#include "ED_mball.h"
#include "ED_logic.h"
#include "ED_clip.h"
More information about the Bf-blender-cvs
mailing list