Merge with trunk r41545

1 files changed, 9 insertions, 81 deletions

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index cadd070c537..5d437fefebc 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -400,7 +400,9 @@ typedef struct SpaceNode {
 	struct bNodeTree *nodetree, *edittree;
 	int treetype;		/* treetype: as same nodetree->type */
 	short texfrom;		/* texfrom object, world or brush */
+	short shaderfrom;	/* shader from object or world */
 	short recalc;		/* currently on 0/1, for auto compo */
+	short pad[3];
 	ListBase linkdrag;	/* temporary data for modal linking operator */
 	
 	struct bGPdata *gpd;		/* grease-pencil data */
@@ -418,6 +420,10 @@ typedef struct SpaceNode {
 #define SNODE_TEX_WORLD		1
 #define SNODE_TEX_BRUSH		2
 
+/* snode->shaderfrom */
+#define SNODE_SHADER_OBJECT	0
+#define SNODE_SHADER_WORLD	1
+
 typedef struct SpaceLogic {
 	SpaceLink *next, *prev;
 	ListBase regionbase;		/* storage of regions for inactive spaces */
@@ -432,68 +438,6 @@ typedef struct SpaceLogic {
 	struct bGPdata *gpd;		/* grease-pencil data */
 } SpaceLogic;
 
-/* note, this entire struct isnt used anymore!,
- * may remove some day - campbell */
-typedef struct SpaceImaSel {
-	SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
-	int spacetype;
-	float blockscale;
-	
-	short blockhandler[8];
-
-	View2D v2d; /* deprecated, copied to region */
-
-	struct FileList *files;
-
-	/* specific stuff for drawing */
-	char title[24];
-	char dir[240];
-	char file[80];
-
-	short type, menu, flag, sort;
-
-	void *curfont;
-	int	active_file;
-
-	int numtilesx;
-	int numtilesy;
-
-	int selstate;
-
-	struct rcti viewrect;
-	struct rcti bookmarkrect;
-
-	float scrollpos; /* current position of scrollhandle */
-	float scrollheight; /* height of the scrollhandle */
-	float scrollarea; /* scroll region, scrollpos is from 0 to scrollarea */
-
-	float aspect;
-	unsigned short retval;		/* event */
-
-	short ipotype;
-	
-	short filter;
-	short active_bookmark;
-	short pad, pad1;
-
-	/* view settings */
-	short prv_w;
-	short prv_h;
-
-	/* one day we'll add unions to dna */
-	void (*returnfunc)(char *);
-	void (*returnfunc_event)(unsigned short);
-	void (*returnfunc_args)(char *, void *, void *);
-	
-	void *arg1, *arg2;
-	short *menup;	/* pointer to menu result or ID browsing */
-	char *pupmenu;	/* optional menu in header */
-
-	struct ImBuf *img;
-} SpaceImaSel;
-
-
 typedef struct ConsoleLine {
 	struct ConsoleLine *next, *prev;
 	
@@ -545,22 +489,6 @@ typedef struct SpaceUserPref {
 
 } SpaceUserPref;
 
-typedef struct SpaceSound {
-	struct SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
-	int spacetype;
-	float blockscale;
-	struct ScrArea *area;
-	
-	View2D v2d;
-	
-	struct bSound *sound;
-	short mode, sndnr;
-	short xof, yof;
-	short flag, lock;
-	int pad2;
-} SpaceSound;
-
 /* view3d  Now in DNA_view3d_types.h */
 
 
@@ -948,11 +876,11 @@ enum {
 	SPACE_INFO,
 	SPACE_SEQ,
 	SPACE_TEXT,
-	SPACE_IMASEL,
-	SPACE_SOUND,
+	SPACE_IMASEL, /* deprecated */
+	SPACE_SOUND, /* Deprecated */
 	SPACE_ACTION,
 	SPACE_NLA,
-	SPACE_SCRIPT,
+	SPACE_SCRIPT, /* Deprecated */
 	SPACE_TIME,
 	SPACE_NODE,
 	SPACE_LOGIC,