Merged changes in the trunk up to revision 40911.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

11 files changed, 40 insertions, 26 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 0fdb84617ad..93d942756c5 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -125,7 +125,7 @@ typedef struct Library {
 
 enum eIconSizes {
 	ICON_SIZE_ICON,
-	ICON_SIZE_PREVIEW,
+	ICON_SIZE_PREVIEW
 };
 #define NUM_ICON_SIZES (ICON_SIZE_PREVIEW + 1)
 
@@ -205,6 +205,10 @@ typedef struct PreviewImage {
 
 #define ID_REAL_USERS(id) (((ID *)id)->us - ((((ID *)id)->flag & LIB_FAKEUSER) ? 1:0))
 
+#define ID_CHECK_UNDO(id) ((GS((id)->name) != ID_SCR) && (GS((id)->name) != ID_WM))
+
+#define ID_BLEND_PATH(_bmain, _id) ((_id)->lib ? (_id)->lib->filepath : (_bmain)->name)
+
 #ifdef GS
 #undef GS
 #endif
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index b7a8f21d724..128f19b504b 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -93,7 +93,7 @@ typedef struct ClothCollSettings
 {
 	struct	LinkNode *collision_list; /* e.g. pointer to temp memory for collisions */
 	float	epsilon;		/* min distance for collisions.		*/
-	float	self_friction;		/* Fiction/damping with self contact.		 	*/
+	float	self_friction;		/* Fiction/damping with self contact. */
 	float	friction;		/* Friction/damping applied on contact with other object.*/
 	float 	selfepsilon; 		/* for selfcollision */
 	float repel_force, distance_repel;
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 1be2c811a1b..e04bdd4ec45 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -344,7 +344,7 @@ typedef struct bPivotConstraint {
 	 *	Either target object + offset, or just offset is used
 	 */
 	struct Object 		*tar;			/* target object (optional) */
-	char	 	subtarget[32];		/* subtarget name (optional) */
+	char		subtarget[32];		/* subtarget name (optional) */
 	float 		offset[3];		/* offset from the target to use, regardless of whether it exists */
 	
 	/* Rotation-driven activation:
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 43a4b99bc33..8fe8b3bcf70 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -56,7 +56,7 @@ typedef struct IpoDriver {
 	short blocktype, adrcode;	/* sub-channel to use */
 	
 	short type, flag;			/* driver settings */
-	char name[128];	 			/* bone, or python expression here */
+	char name[128];				/* bone, or python expression here */
 } IpoDriver;
 
 /* --- IPO Curve --- */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index e9e78ab25d3..0344e6da0ff 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -74,7 +74,7 @@ typedef enum ModifierType {
 	eModifierType_WeightVGEdit,
 	eModifierType_WeightVGMix,
 	eModifierType_WeightVGProximity,
-	eModifierType_NavMesh,
+	eModifierType_EmptySlot,    /* keep so DynamicPaint keep loading, can re-use later */
 	eModifierType_DynamicPaint, /* reserve slot */
 	NUM_MODIFIER_TYPES
 } ModifierType;
@@ -751,10 +751,6 @@ typedef struct ScrewModifierData {
 #define MOD_SCREW_OBJECT_OFFSET	(1<<2)
 // #define MOD_SCREW_OBJECT_ANGLE	(1<<4)
 
-typedef struct NavMeshModifierData {
-	ModifierData modifier;
-} NavMeshModifierData;
-
 typedef struct WarpModifierData {
 	ModifierData modifier;
 
@@ -808,7 +804,7 @@ typedef struct WeightVGEditModifierData {
 	/* Mapping stuff. */
 	struct CurveMapping *cmap_curve;  /* The custom mapping curve! */
 
- 	/* The add/remove vertices weight thresholds. */
+	/* The add/remove vertices weight thresholds. */
 	float	add_threshold, rem_threshold;
 
 	/* Masking options. */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index f32f8d626de..f0c7cf8cc45 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -321,6 +321,9 @@ typedef struct DupliObject {
 /* 23 and 24 are for life and sector (old file compat.) */
 #define	OB_ARMATURE		25
 
+/* check if the object type supports materials */
+#define OB_TYPE_SUPPORT_MATERIAL(_type) ((_type)  >= OB_MESH && (_type) <= OB_MBALL)
+
 /* partype: first 4 bits: type */
 #define PARTYPE			15
 #define PAROBJECT		0
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 69ee530c0b6..9fec5207dbb 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -179,10 +179,12 @@ typedef struct ParticleSettings {
 	float simplify_rate, simplify_transition;
 	float simplify_viewport;
 
-	/* general values */
+	/* time and emission */
 	float sta, end, lifetime, randlife;
-	float timetweak, jitfac, eff_hair, grid_rand;
+	float timetweak, courant_target;
+	float jitfac, eff_hair, grid_rand, ps_offset[1];
 	int totpart, userjit, grid_res, effector_amount;
+	short time_flag, time_pad[3];
 
 	/* initial velocity factors */
 	float normfac, obfac, randfac, partfac, tanfac, tanphase, reactfac;
@@ -288,6 +290,9 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 	struct ParticleDrawData *pdd;
 
 	float *frand;							/* array of 1024 random floats for fast lookups */
+
+	float dt_frac;							/* current time step, as a fraction of a frame */
+	float _pad;								/* spare capacity */
 }ParticleSystem;
 
 /* part->type */
@@ -402,6 +407,9 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_SIMPLIFY_ENABLE	1
 #define PART_SIMPLIFY_VIEWPORT	2
 
+/* part->time_flag */
+#define PART_TIME_AUTOSF	1 /* Automatic subframes */
+
 /* part->bb_align */
 #define PART_BB_X		0
 #define PART_BB_Y		1
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 790f1bf542f..916c3eb9582 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -241,8 +241,8 @@ typedef struct RenderData {
 	short stereomode;	/* standalone player stereo settings */  //  XXX deprecated since 2.5
 	
 	short dimensionspreset;		/* for the dimensions presets menu */
- 	
-	 short filtertype;	/* filter is box, tent, gauss, mitch, etc */
+
+	short filtertype;	/* filter is box, tent, gauss, mitch, etc */
 
 	short size, maximsize;	/* size in %, max in Kb */
 	/* from buttons: */
@@ -431,8 +431,7 @@ typedef struct GameFraming {
 #define SCE_GAMEFRAMING_EXTEND 1
 #define SCE_GAMEFRAMING_SCALE  2
 
-typedef struct RecastData
-{
+typedef struct RecastData {
 	float cellsize;
 	float cellheight;
 	float agentmaxslope;
@@ -446,6 +445,7 @@ typedef struct RecastData
 	int vertsperpoly;
 	float detailsampledist;
 	float detailsamplemaxerror;
+	short pad1, pad2;
 } RecastData;
 
 typedef struct GameData {
@@ -458,8 +458,7 @@ typedef struct GameData {
 	/* stereo/dome mode */
 	struct GameDome dome;
 	short stereoflag, stereomode;
-	short pad2, pad3;
-	float eyeseparation, pad1;
+	float eyeseparation;
 	RecastData recastData;
 
 
@@ -475,17 +474,19 @@ typedef struct GameData {
 	 * bit 3: (gameengine): Activity culling is enabled.
 	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustrum culling
 	*/
-	short mode, flag, matmode, pad[2];
+	int flag;
+	short mode, matmode;
 	short occlusionRes;		/* resolution of occlusion Z buffer in pixel */
 	short physicsEngine;
+	short pad[2];
 	short ticrate, maxlogicstep, physubstep, maxphystep;
-	short obstacleSimulation;
+	short obstacleSimulation, pad1;
 	float levelHeight;
 } GameData;
 
 #define STEREO_NOSTEREO		1
-#define STEREO_ENABLED 		2
-#define STEREO_DOME	 		3
+#define STEREO_ENABLED		2
+#define STEREO_DOME			3
 
 //#define STEREO_NOSTEREO		 1
 #define STEREO_QUADBUFFERED 2
@@ -525,9 +526,9 @@ typedef struct GameData {
 #define GAME_IGNORE_DEPRECATION_WARNINGS	(1 << 12)
 #define GAME_ENABLE_ANIMATION_RECORD		(1 << 13)
 #define GAME_SHOW_MOUSE						(1 << 14)
-#define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 15)
 #define GAME_GLSL_NO_COLOR_MANAGEMENT		(1 << 15)
-/* Note: GameData.flag is a short (max 16 flags). To add more flags, GameData.flag needs to be an int */
+#define GAME_SHOW_OBSTACLE_SIMULATION		(1 << 16)
+/* Note: GameData.flag is now an int (max 32 flags). A short could only take 16 flags */
 
 /* GameData.matmode */
 #define GAME_MAT_TEXFACE	0
@@ -843,7 +844,7 @@ typedef struct Scene {
 	void *sound_scrub_handle;
 	void *speaker_handles;
 	
-	void *fps_info;	 				/* (runtime) info/cache used for presenting playback framerate info to the user */
+	void *fps_info;					/* (runtime) info/cache used for presenting playback framerate info to the user */
 	
 	/* none of the dependancy graph  vars is mean to be saved */
 	struct  DagForest *theDag;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 6e850a07d94..d878a759d22 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -466,6 +466,7 @@ typedef struct TexMapping {
 #define MTEX_5TAP_BUMP		512
 #define MTEX_BUMP_OBJECTSPACE	1024
 #define MTEX_BUMP_TEXTURESPACE	2048
+#define MTEX_BUMP_FLIPPED		4096 /* temp flag for 2.59/2.60 */
 
 /* blendtype */
 #define MTEX_BLEND		0
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 47ebf111eba..9e94ebfb6e8 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -295,6 +295,7 @@ typedef struct wmKeyConfig {
 
 /* wmKeyConfig.flag */
 #define KEYCONF_USER			(1 << 1)
+#define KEYCONF_INIT_DEFAULT	(1 << 2)
 
 /* this one is the operator itself, stored in files for macros etc */
 /* operator + operatortype should be able to redo entirely, but for different contextes */
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 5edebfe3903..e9fd2b2baa2 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -27,7 +27,7 @@
 
 # message(STATUS "Configuring makesdna")
 
-# add_definitions(-DWITH_DNA_GHASH)
+add_definitions(-DWITH_DNA_GHASH)
 
 blender_include_dirs(
 	../../../../intern/guardedalloc