Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2008-12-11 22:35:27 +0300
committerTon Roosendaal <ton@blender.org>2008-12-11 22:35:27 +0300
commit7a1100c8b536a63a72f3a28947f31c9cf94480d5 (patch)
treeb7db0519bf1a9b9b39bdf754cb62a3ef4b4df148 /source/blender/makesdna
parentd39b43aa2010c9b5262428b4afedebd1686307ba (diff)
2.5
Today's progress; half working, but i better commit to prevent conflicts tomorrow :) - added storage for regions in spacedata - added space switching (unfinished, gives mem-free errors) - bugfix: icon of timewindow gave error on split-area - cleaned interface_icons.c a bit, no warnings - first work on space new() callbacks, they have to make regions too NOTE: probably files saved with 2.5 crash now. Have to look at patching this. NOTE2: the Makefiles required libeditor screen twice... scons too?
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_action_types.h1
-rw-r--r--source/blender/makesdna/DNA_sound_types.h1
-rw-r--r--source/blender/makesdna/DNA_space_types.h14
-rw-r--r--source/blender/makesdna/DNA_view3d_types.h1
4 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 4a10ecf2368..73a20512470 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -175,6 +175,7 @@ typedef struct bAction {
/* Action Editor Space. This is defined here instead of in DNA_space_types.h */
typedef struct SpaceAction {
struct SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
struct ScrArea *area;
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index d05e6f1bae8..5dedd20e1e4 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -132,6 +132,7 @@ typedef struct bSoundListener {
typedef struct SpaceSound {
struct SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
struct ScrArea *area;
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index d2bb480b109..3d8047c6100 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -60,6 +60,7 @@ struct bGPdata;
typedef struct SpaceLink {
struct SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale; /* XXX depricate this */
short blockhandler[8]; /* XXX depricate this */
@@ -67,6 +68,7 @@ typedef struct SpaceLink {
typedef struct SpaceInfo {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -75,6 +77,7 @@ typedef struct SpaceInfo {
typedef struct SpaceIpo {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -102,6 +105,7 @@ typedef struct SpaceIpo {
typedef struct SpaceButs {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
struct RenderInfo *ri;
@@ -133,6 +137,7 @@ typedef struct SpaceButs {
typedef struct SpaceSeq {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -152,6 +157,7 @@ typedef struct SpaceSeq {
typedef struct SpaceFile {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -186,6 +192,7 @@ typedef struct SpaceFile {
typedef struct SpaceOops {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -215,6 +222,7 @@ typedef struct SpaceOops {
typedef struct SpaceImage {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -247,6 +255,7 @@ typedef struct SpaceImage {
typedef struct SpaceNla {
struct SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -261,6 +270,7 @@ typedef struct SpaceNla {
typedef struct SpaceText {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -308,6 +318,7 @@ typedef struct Script {
typedef struct SpaceScript {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
struct Script *script;
@@ -320,6 +331,7 @@ typedef struct SpaceScript {
typedef struct SpaceTime {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -331,6 +343,7 @@ typedef struct SpaceTime {
typedef struct SpaceNode {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
@@ -358,6 +371,7 @@ typedef struct SpaceNode {
typedef struct SpaceImaSel {
SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index f1fa8c19199..d281c1e5213 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -72,6 +72,7 @@ typedef struct BGpic {
/* 3D ViewPort Struct */
typedef struct View3D {
struct SpaceLink *next, *prev;
+ ListBase regionbase; /* storage of regions for inactive spaces */
int spacetype;
float blockscale;