svn merge -r41779:41847 ^/trunk/blender

7 files changed, 109 insertions, 19 deletions

diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 3620131b8df..c85ef72d337 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -410,7 +410,7 @@ typedef struct bShrinkwrapConstraint {
 typedef struct bFollowTrackConstraint {
 	struct MovieClip	*clip;
 	char	track[24];
-	int		flag, reference;
+	int		flag, pad;
 } bFollowTrackConstraint;
 
 /* Camera Solver constraints */
@@ -751,14 +751,9 @@ typedef enum ePivotConstraint_Flag {
 	PIVOTCON_FLAG_ROTACT_NEG	= (1<<1)
 } ePivotConstraint_Flag;
 
-/* FollowTrack Constraint -> flag */
-typedef enum eFollowTrack_Reference {
-	FOLLOWTRACK_TRACK		= (1<<0),
-	FOLLOWTRACK_BUNDLE		= (1<<1)
-} FollowTrack_Reference;
-
 typedef enum eFollowTrack_Flags {
-	FOLLOWTRACK_ACTIVECLIP	= (1<<0)
+	FOLLOWTRACK_ACTIVECLIP	= (1<<0),
+	FOLLOWTRACK_USE_3D_POSITION	= (1<<1)
 } eFollowTrack_Flags;
 
 /* CameraSolver Constraint -> flag */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index c72be9cb1a8..30c22864db1 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -73,8 +73,8 @@ typedef enum ModifierType {
 	eModifierType_WeightVGEdit,
 	eModifierType_WeightVGMix,
 	eModifierType_WeightVGProximity,
-	eModifierType_EmptySlot,    /* keep so DynamicPaint keep loading, can re-use later */
-	eModifierType_DynamicPaint, /* reserve slot */
+	eModifierType_Ocean,
+	eModifierType_DynamicPaint,
 
 	/* BMESH ONLY - keeps getting bumped by new modifiers in trunk */
 	eModifierType_NgonInterp,
@@ -754,6 +754,65 @@ typedef struct ScrewModifierData {
 #define MOD_SCREW_OBJECT_OFFSET	(1<<2)
 // #define MOD_SCREW_OBJECT_ANGLE	(1<<4)
 
+typedef struct OceanModifierData {
+	ModifierData modifier;		
+	
+	struct Ocean *ocean;
+	struct OceanCache *oceancache;
+	
+	int		resolution;
+	int		spatial_size;
+	
+	float	wind_velocity;
+	
+	float	damp;
+	float	smallest_wave;
+	float	depth;
+	
+	float	wave_alignment;
+	float	wave_direction;
+	float	wave_scale;
+	
+	float	chop_amount;
+	float	foam_coverage;
+	float	time;
+	
+	int		seed;
+	int		flag;
+	int		output;
+	
+	int		refresh;
+	
+	int		bakestart;
+	int		bakeend;
+	
+	char	cachepath[240];	// FILE_MAX
+	int		cached;
+	
+	int		geometry_mode;
+	float	size;
+	int		repeat_x;
+	int		repeat_y;
+	
+	float	foam_fade;
+	
+} OceanModifierData;
+
+#define MOD_OCEAN_GEOM_GENERATE	0
+#define MOD_OCEAN_GEOM_DISPLACE	1
+#define MOD_OCEAN_GEOM_SIM_ONLY	2
+
+#define MOD_OCEAN_REFRESH_RESET			1
+#define MOD_OCEAN_REFRESH_SIM			2
+#define MOD_OCEAN_REFRESH_ADD			4
+#define MOD_OCEAN_REFRESH_CLEAR_CACHE	8
+#define MOD_OCEAN_REFRESH_TOPOLOGY		16
+
+#define MOD_OCEAN_GENERATE_FOAM	1
+#define MOD_OCEAN_GENERATE_NORMALS	2
+
+
+/* BMESH_ONLY */
 typedef struct NgonInterpModifierData {
 	ModifierData modifier;
 	int		resolution, pad0;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 07c2885eff7..1897f8a0353 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -376,9 +376,10 @@ typedef struct NodeVertexCol {
 
 /* qdn: Defocus blur node */
 typedef struct NodeDefocus {
-	char bktype, rotation, preview, gamco;
+	char bktype, pad_c1, preview, gamco;
 	short samples, no_zbuf;
 	float fstop, maxblur, bthresh, scale;
+	float rotation, pad_f1;
 } NodeDefocus;
 
 typedef struct NodeScriptDict {
@@ -389,8 +390,9 @@ typedef struct NodeScriptDict {
 /* qdn: glare node */
 typedef struct NodeGlare {
 	char quality, type, iter;
-	char angle, angle_ofs, size, pad[2];
+	char angle, pad_c1, size, pad[2];
 	float colmod, mix, threshold, fade;
+	float angle_ofs, pad_f1;
 } NodeGlare;
 
 /* qdn: tonemap node */
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 1ecca5a0b2a..619df428f7c 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -50,6 +50,7 @@ struct Tex;
 struct Image;
 struct PreviewImage;
 struct ImBuf;
+struct Ocean;
 struct CurveMapping;
 
 typedef struct MTex {
@@ -206,6 +207,15 @@ typedef struct VoxelData {
 	
 } VoxelData;
 
+typedef struct OceanTex {
+	struct Object *object;
+	char oceanmod[64];
+	
+	int output;
+	int pad;
+	
+} OceanTex;
+	
 typedef struct Tex {
 	ID id;
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
@@ -261,13 +271,14 @@ typedef struct Tex {
 	struct PreviewImage * preview;
 	struct PointDensity *pd;
 	struct VoxelData *vd;
+	struct OceanTex *ot;
 	
 	char use_nodes;
 	char pad[7];
 	
 } Tex;
 
-/* used for mapping and texture nodes. note: rot is in degrees */
+/* used for mapping and texture nodes. note: rot is now in radians */
 
 typedef struct TexMapping {
 	float loc[3], rot[3], size[3];
@@ -318,6 +329,7 @@ typedef struct ColorMapping {
 #define TEX_DISTNOISE	13
 #define TEX_POINTDENSITY	14
 #define TEX_VOXELDATA		15
+#define TEX_OCEAN		16
 
 /* musgrave stype */
 #define TEX_MFRACTAL		0
@@ -588,6 +600,18 @@ typedef struct ColorMapping {
 #define TEX_VD_SMOKEHEAT		1
 #define TEX_VD_SMOKEVEL			2
 
+/******************** Ocean *****************************/
+/* output */
+#define TEX_OCN_DISPLACEMENT	1
+#define TEX_OCN_FOAM			2
+#define TEX_OCN_JPLUS			3
+#define TEX_OCN_EMINUS			4	
+#define TEX_OCN_EPLUS			5
+
+/* flag */
+#define TEX_OCN_GENERATE_NORMALS	1	
+#define TEX_OCN_XZ				2	
+	
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index b359ea3544d..e1aff048626 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -123,6 +123,11 @@ typedef struct MovieTrackingSettings {
 	/* ** reconstruction settings ** */
 	int keyframe1, keyframe2;	/* two keyframes for reconstrution initialization */
 
+	/* ** which camera intrinsics to refine. uses on the REFINE_* flags */
+	short refine_camera_intrinsics;
+
+	char pad2[6];
+
 	/* ** tool settings ** */
 
 	/* set scale */
@@ -203,6 +208,12 @@ enum {
 #define TRACKING_SPEED_QUARTER		4
 #define TRACKING_SPEED_DOUBLE		5
 
+/* MovieTrackingSettings->refine_camera_intrinsics */
+#define REFINE_FOCAL_LENGTH			(1<<0)
+#define REFINE_PRINCIPAL_POINT		(1<<1)
+#define REFINE_RADIAL_DISTORTION_K1	(1<<2)
+#define REFINE_RADIAL_DISTORTION_K2	(1<<4)
+
 /* MovieTrackingStrabilization->flag */
 #define TRACKING_2D_STABILIZATION	(1<<0)
 #define TRACKING_AUTOSCALE			(1<<1)
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 81753ed5b21..92c32470057 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -605,7 +605,6 @@ extern UserDef U; /* from blenkernel blender.c */
 */
 /* actually... users probably don't care about what the mode
    is called, just that it feels right */
-#define NDOF_ORBIT_INVERT_AXES (1 << 6)
 /* zoom is up/down if this flag is set (otherwise forward/backward) */
 #define NDOF_ZOOM_UPDOWN (1 << 7)
 #define NDOF_ZOOM_INVERT (1 << 8)
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index c060eb186c9..ebd51d1c102 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -64,7 +64,7 @@
 
 /* Included the path relative from /source/blender/ here, so we can move     */
 /* headers around with more freedom.                                         */
-const char *includefiles[] = {
+static const char *includefiles[] = {
 
 	// if you add files here, please add them at the end
 	// of makesdna.c (this file) as well
@@ -224,7 +224,7 @@ void printStructLenghts(void);
 
 /* ************************* MAKEN DNA ********************** */
 
-int add_type(const char *str, int len)
+static int add_type(const char *str, int len)
 {
 	int nr;
 	char *cp;
@@ -399,7 +399,7 @@ static int add_name(const char *str)
 	return nr_names-1;
 }
 
-short *add_struct(int namecode)
+static short *add_struct(int namecode)
 {
 	int len;
 	short *sp;
@@ -522,7 +522,7 @@ static void *read_file_data(char *filename, int *len_r)
 	return data;
 }
 
-int convert_include(char *filename)
+static int convert_include(char *filename)
 {
 	/* read include file, skip structs with a '#' before it.
 	   store all data in temporal arrays.
@@ -659,7 +659,7 @@ int convert_include(char *filename)
 	return 0;
 }
 
-int arraysize(char *astr, int len)
+static int arraysize(char *astr, int len)
 {
 	int a, mul=1;
 	char str[100], *cp=NULL;