svn merge ^/trunk/blender 58498:59138

9 files changed, 82 insertions, 53 deletions

diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index 1f2a589dc27..d2b95c959b3 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -125,7 +125,8 @@ typedef struct DynamicPaintSurface {
 	float influence_scale, radius_scale;
 
 	/* wave settings */
-	float wave_damping, wave_speed, wave_timescale, wave_spring;
+	float wave_damping, wave_speed, wave_timescale, wave_spring, wave_smoothness;
+	int pad2;
 
 	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	char image_output_path[1024];  /* 1024 = FILE_MAX */
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 456196771a6..dae520f458d 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -106,7 +106,7 @@ typedef struct Image {
 	/* for generated images */
 	int gen_x, gen_y;
 	char gen_type, gen_flag;
-	char gen_pad[2];
+	short gen_depth;
 	
 	/* display aspect - for UV editing images resized for faster openGL display */
 	float aspx, aspy;
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 947bf593310..e37d1368892 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -33,7 +33,6 @@
 #define __DNA_MESH_TYPES_H__
 
 #include "DNA_defs.h"
-#include "DNA_listBase.h"
 #include "DNA_ID.h"
 #include "DNA_customdata_types.h"
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a76f57a3e7c..5e65369b32d 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -282,16 +282,23 @@ typedef struct BevelModifierData {
 	short val_flags;      /* flags used to interpret the bevel value */
 	short lim_flags;      /* flags to tell the tool how to limit the bevel */
 	short e_flags;        /* flags to direct how edge weights are applied to verts */
-	float bevel_angle;    /* if the BME_BEVEL_ANGLE is set, this will be how "sharp" an edge must be before it gets beveled */
-	char defgrp_name[64]; /* if the BME_BEVEL_VWEIGHT option is set, this will be the name of the vert group, MAX_VGROUP_NAME */
+	float bevel_angle;    /* if the MOD_BEVEL_ANGLE is set, this will be how "sharp" an edge must be before it gets beveled */
+	char defgrp_name[64]; /* if the MOD_BEVEL_VWEIGHT option is set, this will be the name of the vert group, MAX_VGROUP_NAME */
 } BevelModifierData;
 
-typedef struct BMeshModifierData {
-	ModifierData modifier;
-
-	float pad;
-	int type;
-} BMeshModifierData;
+#define MOD_BEVEL_VERT          (1 << 1)
+// #define MOD_BEVEL_RADIUS        (1 << 2)
+#define MOD_BEVEL_ANGLE         (1 << 3)
+#define MOD_BEVEL_WEIGHT        (1 << 4)
+#define MOD_BEVEL_VGROUP        (1 << 5)
+#define MOD_BEVEL_EMIN          (1 << 7)
+#define MOD_BEVEL_EMAX          (1 << 8)
+// #define MOD_BEVEL_RUNNING       (1 << 9)
+// #define MOD_BEVEL_RES           (1 << 10)
+// #define MOD_BEVEL_EVEN          (1 << 11) /* this is a new setting not related to old (trunk bmesh bevel code) but adding
+//                                               * here because they are mixed - campbell */
+// #define MOD_BEVEL_DIST          (1 << 12) /* same as above */
+#define MOD_BEVEL_OVERLAP_OK    (1 << 13)
 
 
 /* Smoke modifier flags */
@@ -714,8 +721,7 @@ typedef struct SimpleDeformModifierData {
 
 	char mode;				/* deform function */
 	char axis;				/* lock axis (for taper and strech) */
-	char originOpts;		/* originOptions */
-	char pad;
+	char pad[2];
 
 } SimpleDeformModifierData;
 
@@ -727,12 +733,6 @@ typedef struct SimpleDeformModifierData {
 #define MOD_SIMPLEDEFORM_LOCK_AXIS_X			(1<<0)
 #define MOD_SIMPLEDEFORM_LOCK_AXIS_Y			(1<<1)
 
-/* indicates whether simple deform should use the local
- * coordinates or global coordinates of origin */
-/* XXX, this should have never been an option, all other modifiers work relatively
- * (so moving both objects makes no change!) - Campbell */
-#define MOD_SIMPLEDEFORM_ORIGIN_LOCAL			(1<<0)
-
 #define MOD_UVPROJECT_MAX				10
 
 typedef struct ShapeKeyModifierData {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 8a9a95a9935..9ff4392242e 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -788,6 +788,12 @@ typedef struct NodeShaderAttribute {
 	char name[64];
 } NodeShaderAttribute;
 
+typedef struct NodeShaderVectTransform {
+	int type;
+	int convert_from, convert_to;
+	int pad;
+} NodeShaderVectTransform;
+
 /* TEX_output */
 typedef struct TexNodeOutput {
 	char name[64];
@@ -869,6 +875,15 @@ typedef struct NodeShaderNormalMap {
 #define SHD_GLOSSY_SHARP	1
 #define SHD_GLOSSY_GGX		2
 
+/* vector transform */
+#define SHD_VECT_TRANSFORM_TYPE_VECTOR	0
+#define SHD_VECT_TRANSFORM_TYPE_POINT	1
+#define SHD_VECT_TRANSFORM_TYPE_NORMAL	2
+
+#define SHD_VECT_TRANSFORM_SPACE_WORLD	0
+#define SHD_VECT_TRANSFORM_SPACE_OBJECT	1
+#define SHD_VECT_TRANSFORM_SPACE_CAMERA	2
+
 /* toon modes */
 #define SHD_TOON_DIFFUSE	0
 #define SHD_TOON_GLOSSY		1
diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h
index 17124a724fe..53061b55e2d 100644
--- a/source/blender/makesdna/DNA_outliner_types.h
+++ b/source/blender/makesdna/DNA_outliner_types.h
@@ -32,7 +32,7 @@
 #ifndef __DNA_OUTLINER_TYPES_H__
 #define __DNA_OUTLINER_TYPES_H__
 
-#include "DNA_listBase.h"
+#include "DNA_defs.h"
 
 struct ID;
 
@@ -41,9 +41,12 @@ typedef struct TreeStoreElem {
 	struct ID *id;
 } TreeStoreElem;
 
+/* used only to store data in in blend files */
 typedef struct TreeStore {
-	int totelem, usedelem;
-	TreeStoreElem *data;
+	int totelem  DNA_DEPRECATED; /* was previously used for memory preallocation */
+	int usedelem;                /* number of elements in data array */
+	TreeStoreElem *data;         /* elements to be packed from mempool in writefile.c
+	                              * or extracted to mempool in readfile.c */
 } TreeStore;
 
 /* TreeStoreElem->flag */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 5e877ed697b..ceb745cf90a 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -209,34 +209,37 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_NEG_ZMASK	0x80000
 
 /* srl->passflag */
-#define SCE_PASS_COMBINED			(1<<0)
-#define SCE_PASS_Z					(1<<1)
-#define SCE_PASS_RGBA				(1<<2)
-#define SCE_PASS_DIFFUSE			(1<<3)
-#define SCE_PASS_SPEC				(1<<4)
-#define SCE_PASS_SHADOW				(1<<5)
-#define SCE_PASS_AO					(1<<6)
-#define SCE_PASS_REFLECT			(1<<7)
-#define SCE_PASS_NORMAL				(1<<8)
-#define SCE_PASS_VECTOR				(1<<9)
-#define SCE_PASS_REFRACT			(1<<10)
-#define SCE_PASS_INDEXOB			(1<<11)
-#define SCE_PASS_UV					(1<<12)
-#define SCE_PASS_INDIRECT			(1<<13)
-#define SCE_PASS_MIST				(1<<14)
-#define SCE_PASS_RAYHITS			(1<<15)
-#define SCE_PASS_EMIT				(1<<16)
-#define SCE_PASS_ENVIRONMENT		(1<<17)
-#define SCE_PASS_INDEXMA			(1<<18)
-#define SCE_PASS_DIFFUSE_DIRECT		(1<<19)
-#define SCE_PASS_DIFFUSE_INDIRECT	(1<<20)
-#define SCE_PASS_DIFFUSE_COLOR		(1<<21)
-#define SCE_PASS_GLOSSY_DIRECT		(1<<22)
-#define SCE_PASS_GLOSSY_INDIRECT	(1<<23)
-#define SCE_PASS_GLOSSY_COLOR		(1<<24)
-#define SCE_PASS_TRANSM_DIRECT		(1<<25)
-#define SCE_PASS_TRANSM_INDIRECT	(1<<26)
-#define SCE_PASS_TRANSM_COLOR		(1<<27)
+#define SCE_PASS_COMBINED				(1<<0)
+#define SCE_PASS_Z						(1<<1)
+#define SCE_PASS_RGBA					(1<<2)
+#define SCE_PASS_DIFFUSE				(1<<3)
+#define SCE_PASS_SPEC					(1<<4)
+#define SCE_PASS_SHADOW					(1<<5)
+#define SCE_PASS_AO						(1<<6)
+#define SCE_PASS_REFLECT				(1<<7)
+#define SCE_PASS_NORMAL					(1<<8)
+#define SCE_PASS_VECTOR					(1<<9)
+#define SCE_PASS_REFRACT				(1<<10)
+#define SCE_PASS_INDEXOB				(1<<11)
+#define SCE_PASS_UV						(1<<12)
+#define SCE_PASS_INDIRECT				(1<<13)
+#define SCE_PASS_MIST					(1<<14)
+#define SCE_PASS_RAYHITS				(1<<15)
+#define SCE_PASS_EMIT					(1<<16)
+#define SCE_PASS_ENVIRONMENT			(1<<17)
+#define SCE_PASS_INDEXMA				(1<<18)
+#define SCE_PASS_DIFFUSE_DIRECT			(1<<19)
+#define SCE_PASS_DIFFUSE_INDIRECT		(1<<20)
+#define SCE_PASS_DIFFUSE_COLOR			(1<<21)
+#define SCE_PASS_GLOSSY_DIRECT			(1<<22)
+#define SCE_PASS_GLOSSY_INDIRECT		(1<<23)
+#define SCE_PASS_GLOSSY_COLOR			(1<<24)
+#define SCE_PASS_TRANSM_DIRECT			(1<<25)
+#define SCE_PASS_TRANSM_INDIRECT		(1<<26)
+#define SCE_PASS_TRANSM_COLOR			(1<<27)
+#define SCE_PASS_SUBSURFACE_DIRECT		(1<<28)
+#define SCE_PASS_SUBSURFACE_INDIRECT	(1<<29)
+#define SCE_PASS_SUBSURFACE_COLOR		(1<<30)
 
 /* note, srl->passflag is treestore element 'nr' in outliner, short still... */
 
@@ -652,7 +655,8 @@ typedef struct GameData {
 	short mode, matmode;
 	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */
 	short physicsEngine;
-	short exitkey, pad;
+	short exitkey;
+	short vsync; /* Controls vsync: off, on, or adaptive (if supported) */
 	short ticrate, maxlogicstep, physubstep, maxphystep;
 	short obstacleSimulation;
 	short raster_storage;
@@ -688,6 +692,11 @@ typedef struct GameData {
 #define RAS_STORE_VA		2
 #define RAS_STORE_VBO		3
 
+/* vsync */
+#define VSYNC_OFF	0
+#define VSYNC_ON	1
+#define VSYNC_ADAPTIVE	2
+
 /* GameData.flag */
 #define GAME_RESTRICT_ANIM_UPDATES			(1 << 0)
 #define GAME_ENABLE_ALL_FRAMES				(1 << 1)
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 6dc45e4a6de..040942d6cea 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -33,7 +33,6 @@
 #ifndef __DNA_SOUND_TYPES_H__
 #define __DNA_SOUND_TYPES_H__
 
-#include "DNA_listBase.h"
 #include "DNA_ID.h"
 
 /* stupid... could easily be solved */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 2d87cb1d890..c562a1fefae 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -72,6 +72,8 @@ struct wmTimer;
 struct MovieClip;
 struct MovieClipScopes;
 struct Mask;
+struct GHash;
+struct BLI_mempool;
 
 
 /* SpaceLink (Base) ==================================== */
@@ -244,13 +246,14 @@ typedef struct SpaceOops {
 	View2D v2d DNA_DEPRECATED;  /* deprecated, copied to region */
 	
 	ListBase tree;
-	struct TreeStore *treestore;
+	struct BLI_mempool *treestore;
 	
 	/* search stuff */
 	char search_string[32];
 	struct TreeStoreElem search_tse;
 
 	short flag, outlinevis, storeflag, search_flags;
+	struct GHash *treehash;
 } SpaceOops;