svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender

6 files changed, 26 insertions, 20 deletions

diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index d08cf42867d..ca0ad06eac3 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -193,7 +193,8 @@ typedef struct bGameActuator {
 } bGameActuator;
 
 typedef struct bVisibilityActuator {
-	/** bit 0: Is this object visible? */
+	/** bit 0: Is this object visible? 
+	 ** bit 1: Apply recursively  */
 	int flag;
 } bVisibilityActuator;
 
@@ -448,6 +449,7 @@ typedef struct FreeCamera {
 /* visibilityact->flag */
 /* Set means the object will become invisible */
 #define ACT_VISIBILITY_INVISIBLE       (1 << 0)
+#define ACT_VISIBILITY_RECURSIVE       (1 << 1)
 
 /* twodfilter->type */
 #define ACT_2DFILTER_ENABLED			-2
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 914b22b9ccc..f517bf14733 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -142,24 +142,24 @@ typedef short IPO_Channel;
 #define MA_FRESTRAI	25
 #define MA_ADD		26
 
-#define MA_MAP1		1<<5
-#define MA_MAP2		1<<6
-#define MA_MAP3		1<<7
-#define MA_MAP4		1<<8
-#define MA_MAP5		1<<9
-#define MA_MAP6		1<<10
-#define MA_MAP7		1<<11
-#define MA_MAP8		1<<12
-#define MA_MAP9		1<<13
-#define MA_MAP10	1<<14
-#define MA_MAP11	1<<15
-#define MA_MAP12	1<<16
-#define MA_MAP13	1<<17
-#define MA_MAP14	1<<18
-#define MA_MAP15	1<<19
-#define MA_MAP16	1<<20
-#define MA_MAP17	1<<21
-#define MA_MAP18	1<<22
+#define MA_MAP1		(1<<5)
+#define MA_MAP2		(1<<6)
+#define MA_MAP3		(1<<7)
+#define MA_MAP4		(1<<8)
+#define MA_MAP5		(1<<9)
+#define MA_MAP6		(1<<10)
+#define MA_MAP7		(1<<11)
+#define MA_MAP8		(1<<12)
+#define MA_MAP9		(1<<13)
+#define MA_MAP10	(1<<14)
+#define MA_MAP11	(1<<15)
+#define MA_MAP12	(1<<16)
+#define MA_MAP13	(1<<17)
+#define MA_MAP14	(1<<18)
+#define MA_MAP15	(1<<19)
+#define MA_MAP16	(1<<20)
+#define MA_MAP17	(1<<21)
+#define MA_MAP18	(1<<22)
 
 #define TEX_TOTNAM	14
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 72050b0809e..32522d1e866 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -790,6 +790,7 @@ typedef struct Scene {
 /* toolsettings->uvcalc_flag */
 #define UVCALC_FILLHOLES			1
 #define UVCALC_NO_ASPECT_CORRECT	2	/* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
+#define UVCALC_TRANSFORM_CORRECT	4	/* adjust UV's while transforming to avoid distortion */
 
 /* toolsettings->edge_mode */
 #define EDGE_MODE_SELECT				0
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 8e849c5aa3d..c59cafc1ef0 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -538,6 +538,7 @@ typedef struct SpaceImaSel {
 #define SI_DRAW_TILE	1<<19 
 #define SI_SMOOTH_UV	1<<20
 #define SI_DRAW_STRETCH	1<<21
+#define SI_DISPGP		1<<22
 
 /* SpaceIpo->flag */
 #define SIPO_LOCK_VIEW			1<<0
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 11b35b4d6d4..981591dc810 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -268,6 +268,7 @@ extern UserDef U; /* from usiblender.c !!!! */
 #define USER_GLOBALUNDO     	(1 << 13)
 #define USER_ORBIT_SELECTION	(1 << 14)
 // old flag for #define USER_KEYINSERTAVAI		(1 << 15)
+#define USER_ORBIT_ZBUF			(1 << 15)
 #define USER_HIDE_DOT			(1 << 16)
 #define USER_SHOW_ROTVIEWICON	(1 << 17)
 #define USER_SHOW_VIEWPORTNAME	(1 << 18)
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 135272b9ac2..b30a7162b93 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -86,7 +86,8 @@ typedef struct View3D {
 	float winmat1[4][4];  // persp(1) storage, for swap matrices
 	float viewmat1[4][4];
 	
-	float viewquat[4], dist, zfac, pad0;	/* zfac is initgrabz() result */
+	float viewquat[4], dist, zfac;	/* zfac is initgrabz() result */
+	int lay_used; /* used while drawing */
 
 	short persp;
 	short view;