move SPACE_* (enum) and SPACEICONMAX to DNA_space_types (being the more logical place...
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 7 Nov 2006 11:24:11 +0000 (11:24 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 7 Nov 2006 11:24:11 +0000 (11:24 +0000)
19 files changed:
source/blender/include/BSE_headerbuttons.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/python/api2_2x/Scene.c
source/blender/python/api2_2x/windowTheme.h
source/blender/radiosity/intern/source/raddisplay.c
source/blender/src/editaction.c
source/blender/src/editcurve.c
source/blender/src/editmball.c
source/blender/src/editmesh_add.c
source/blender/src/editobject.c
source/blender/src/editsima.c
source/blender/src/editsound.c
source/blender/src/editview.c
source/blender/src/fluidsim.c
source/blender/src/renderwin.c
source/blender/src/spacetypes.c
source/blender/src/transform_snap.c
source/blender/src/vpaint.c

index 50e4168ebd2d674b83ec7cd90189a53d8c8c9cb4..4c2e4a4c8c69ab448fb02f621d8846bf18dac8f7 100644 (file)
@@ -40,7 +40,6 @@ struct SpaceIpo;
 struct Ipo;
 
 /* these used to be in blender/src/headerbuttons.c: */
-#define SPACEICONMAX  16 /* See release/datafiles/blenderbuttons */
 #define XIC 20
 #define YIC 20
 
index 82588b198864345ce56eae91c122113f4b20e211..7aab508c47326fe0e11b8c6f269cfdcdd7fec330 100644 (file)
@@ -164,31 +164,5 @@ typedef struct ScrArea {
 #define SCREEN_HANDLER_PYTHON   2
 #define SCREEN_HANDLER_VERSE   3
 
-/* dunno who thought this below is nice code, but be warned, the values are written in
-   a file, and cannot be switched or altered. enum here is out of focus (ton) */
-enum {
-       SPACE_EMPTY,
-       SPACE_VIEW3D,
-       SPACE_IPO,
-       SPACE_OOPS,
-       SPACE_BUTS,
-       SPACE_FILE,
-       SPACE_IMAGE,            
-       SPACE_INFO,
-       SPACE_SEQ,
-       SPACE_TEXT,
-       SPACE_IMASEL,
-       SPACE_SOUND,
-       SPACE_ACTION,
-       SPACE_NLA,
-       SPACE_SCRIPT,
-       SPACE_TIME,
-       SPACE_NODE
-/*     SPACE_LOGIC     */
-};
-
-/* Adding a new space type?  Change SPACEICONMAX in BSE_headerbuttons.h */
-/* -- should rather handle this with the above enum... */
-
 #endif
 
index d5f50529ca90d446de0ce9732f5ad789f4451469..f89f67529a618e74e1a1e0af1508afb2bc5dfcca 100644 (file)
@@ -493,6 +493,7 @@ typedef struct SpaceImaSel {
 #define ST_SCROLL_SELECT        0x0001 // scrollable
 #define ST_CLEAR_NAMESPACE      0x0010 // clear namespace after script
                                        // execution (see BPY_main.c)
+
 /* SpaceOops->type */
 #define SO_OOPS                        0
 #define SO_OUTLINER            1
@@ -590,4 +591,27 @@ typedef struct SpaceImaSel {
 /* sseq->flag */
 #define SEQ_DRAWFRAMES  1
 
+/* space types, moved from DNA_screen_types.h */
+enum {
+       SPACE_EMPTY,
+       SPACE_VIEW3D,
+       SPACE_IPO,
+       SPACE_OOPS,
+       SPACE_BUTS,
+       SPACE_FILE,
+       SPACE_IMAGE,            
+       SPACE_INFO,
+       SPACE_SEQ,
+       SPACE_TEXT,
+       SPACE_IMASEL,
+       SPACE_SOUND,
+       SPACE_ACTION,
+       SPACE_NLA,
+       SPACE_SCRIPT,
+       SPACE_TIME,
+       SPACE_NODE,
+       SPACEICONMAX = SPACE_NODE
+/*     SPACE_LOGIC     */
+};
+
 #endif
index 3f2d8071c554cf01769a83e5ffd2b27e01423ade..8b096f818404f32ec1797b8c1fcce14205f5db3e 100644 (file)
@@ -37,7 +37,8 @@ struct View3D;
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "MEM_guardedalloc.h"  /* for MEM_callocN */
-#include "DNA_screen_types.h"  /* SPACE_VIEW3D, SPACE_SEQ */
+#include "DNA_space_types.h"   /* SPACE_VIEW3D, SPACE_SEQ */
+#include "DNA_screen_types.h"
 #include "DNA_userdef_types.h" /* U.userdefs */
 #include "DNA_object_types.h" /* SceneObSeq_new */
 #include "BKE_depsgraph.h"
index 3d3fa9a37f03d8e33b288faa5c3341b28376009a..761d509724dfb962653d95c7d010fbfef4f19248 100644 (file)
@@ -35,6 +35,7 @@
 
 #include <Python.h>
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 
 typedef struct {
index 79d40cbab7db93f5d0b2645b4635a2d806afff74..429e9de28a296bffb4b8c287c8850a28571d810c 100644 (file)
@@ -50,6 +50,7 @@
 #include "BLI_blenlib.h"
 
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BKE_global.h"
index ea769545c9457cf2f8b69fc0b38c5e1c92cfee42..6858d2329bdf8670ef13c3265d97373b573285fc 100644 (file)
@@ -47,6 +47,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
index 1ed58bdf61a9d95fe2b133c5af191d4cd213e830..d481e37f905c9189f3a4313d9d08cba1f439593c 100644 (file)
@@ -58,6 +58,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"
 
index f0f765dbe330d6ef21ff916b29eb37384308a386..f92a341c2b32fca9dd63e66ebc810ee9cc74ecfb 100644 (file)
@@ -42,6 +42,7 @@
 #include "BLI_arithb.h"
 
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_meta_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
index c58a49212ba603440f218716a2a13d5ebfb587d5..9347d7f4793e10ec548938607058d6fd8ea2acce 100644 (file)
@@ -46,6 +46,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_view3d_types.h"
 
index 5c7c151192d38ce41e6dd03e2219c8cf731bac06..36575a6c5c6267e140ba3a26347dd72fc98546d2 100644 (file)
@@ -76,6 +76,7 @@
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
 #include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_property_types.h"
index d8b4aa0548cd2939d2d44449d809a3e788fc9c73..2a7df196bf0feb4ab0bb4692ae1748aa6ab0aa82 100644 (file)
@@ -54,6 +54,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_scene_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_space_types.h"
index 7e685465e4b127eed5f6b23d8320e1d75ccfba86..b1ec94d123b2d357b9fd92654815c55c3e37f8d6 100644 (file)
@@ -55,6 +55,7 @@
 
 #include "DNA_object_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sound_types.h"
 #include "DNA_packedFile_types.h"
index 78130f2ea88e64084b33370e03203fc0762bf75a..39aae4be851e846a41fbea2514d5f1ac017bcfc6 100644 (file)
@@ -55,6 +55,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"
 
index 2103d39a753bfa43dd39f4def60732e3a5b2f2ca..276650a9546e690ea61b2a3017f3b02c74c788b5 100644 (file)
@@ -52,6 +52,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_key_types.h" 
 
index 2152e65940c30ac0c7fd6be4d2c681d795114aa0..f6bd1d7652417d614c720c85508c2a43d1554fe2 100644 (file)
@@ -63,6 +63,7 @@
 #include "BMF_Api.h"
 
 #include "DNA_image_types.h"
+#include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
index 3a4c09e9e1aba50c719255c495b9e592b97bc1b0..ea0d680e852ec67b494bb44b36bee9c89b6d9d4b 100644 (file)
@@ -39,6 +39,7 @@
 #include "BLI_blenlib.h"
 
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 
 #include "BIF_gl.h"
 #include "BIF_mywindow.h"
index 53d1822ae703312fae2dd06c5773ca19af3a0728..9c7d7bc40acee1e6909797a6307befde2078dc21 100644 (file)
@@ -34,7 +34,7 @@
 #include <math.h>
 
 #include "DNA_object_types.h"
-#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
 
index b3c3a45410ce58beb356e901b2e730a48eab1fbb..508b8c48d149363b76dd9df1cac8b2943575c3ee 100644 (file)
@@ -57,6 +57,7 @@
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
 #include "DNA_screen_types.h"
+#include "DNA_space_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 #include "DNA_userdef_types.h"