svn merge -r 30954:31059 https://svn.blender.org/svnroot/bf-blender/trunk/blender

12 files changed, 67 insertions, 124 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 76468ada523..49c2df42810 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -164,7 +164,6 @@ typedef struct PreviewImage {
 #define ID_MA		MAKE_ID2('M', 'A') /* Material */
 #define ID_TE		MAKE_ID2('T', 'E') /* Texture */
 #define ID_IM		MAKE_ID2('I', 'M') /* Image */
-#define ID_WV		MAKE_ID2('W', 'V') /* Wave (unused) */
 #define ID_LT		MAKE_ID2('L', 'T') /* Lattice */
 #define ID_LA		MAKE_ID2('L', 'A') /* Lamp */
 #define ID_CA		MAKE_ID2('C', 'A') /* Camera */
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index d0f15b78ada..f7bbf9235ab 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -33,9 +33,8 @@
 
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
-#include "DNA_gpencil_types.h"
 #include "DNA_view2d_types.h"
-#include "DNA_userdef_types.h"
+#include "DNA_userdef_types.h" /* ThemeWireColor */
 
 struct SpaceLink;
 struct Object;
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 7c9a37072af..76bb9a5f96f 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -37,9 +37,6 @@ struct Scene;
 struct Group;
 struct Text;
 
-// for Sound3D
-#include "DNA_sound_types.h"
-
 /* ****************** ACTUATORS ********************* */
 
 /* unused now, moved to editobjectactuator in 2.02. Still needed for dna */
@@ -61,6 +58,18 @@ typedef struct bActionActuator {
 	float	stridelength;	/* Displacement incurred by cycle */ // not in use
 } bActionActuator;												
 
+typedef struct Sound3D
+{
+	float min_gain;
+	float max_gain;
+	float reference_distance;
+	float max_distance;
+	float rolloff_factor;
+	float cone_inner_angle;
+	float cone_outer_angle;
+	float cone_outer_gain;
+} Sound3D;
+
 typedef struct bSoundActuator {
 	short flag, sndnr;
 	int pad1, pad2;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index dc7d105a8de..1492319fe22 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -31,7 +31,7 @@
 #define DNA_BRUSH_TYPES_H
 
 #include "DNA_ID.h"
-#include "DNA_texture_types.h"
+#include "DNA_texture_types.h" /* for MTex */
 
 //#ifndef MAX_MTEX // XXX Not used?
 //#define MAX_MTEX	18
@@ -60,7 +60,8 @@ typedef struct Brush {
 
 	float normal_weight;
 
-	short blend, pad;		/* blend mode */
+	short blend;		/* blend mode */
+	short ob_mode;		/* & with ob->mode to see if the brush is compatible, use for display only. */
 	int size;			/* brush diameter */
 	int flag;			/* general purpose flag */	
 	float jitter;			/* jitter the position of the brush */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index f310e5e55e0..dbd9be14c0e 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -33,7 +33,6 @@
 
 #include "DNA_ID.h"
 #include "DNA_listBase.h"
-#include "DNA_object_types.h"
 
 struct Action;
 struct Text;
@@ -82,7 +81,7 @@ typedef struct bConstraint {
 typedef struct bConstraintTarget {
 	struct bConstraintTarget *next, *prev;
 
-	Object *tar;			/* object to use as target */
+	struct Object *tar;			/* object to use as target */
 	char subtarget[32];		/* subtarget - pchan or vgroup name */
 	
 	float matrix[4][4];		/* matrix used during constraint solving - should be cleared before each use */
@@ -118,7 +117,7 @@ typedef struct bPythonConstraint {
 	
 	ListBase targets;		/* a list of targets that this constraint has (bConstraintTarget-s) */
 	
-	Object *tar;			/* target from previous implementation (version-patch sets this to NULL on file-load) */
+	struct Object *tar;		/* target from previous implementation (version-patch sets this to NULL on file-load) */
 	char subtarget[32];		/* subtarger from previous implentation (version-patch sets this to "" on file-load) */
 } bPythonConstraint;
 
@@ -130,13 +129,13 @@ typedef struct bPythonConstraint {
    This is indicated in the comments for each field
  */
 typedef struct bKinematicConstraint {
-	Object		*tar;			/* All: target object in case constraint needs a target */
+	struct Object		*tar;			/* All: target object in case constraint needs a target */
 	short		iterations;		/* All: Maximum number of iterations to try */
 	short		flag;			/* All & CopyPose: some options Like CONSTRAINT_IK_TIP */
 	short		rootbone;		/* All: index to rootbone, if zero go all the way to mother bone */
 	short		max_rootbone;	/* CopyPose: for auto-ik, maximum length of chain */
 	char		subtarget[32];	/* All: String to specify sub-object target */
-	Object		*poletar;			/* All: Pole vector target */
+	struct Object		*poletar;			/* All: Pole vector target */
 	char		polesubtarget[32];	/* All: Pole vector sub-object target */
 	float		poleangle;			/* All: Pole vector rest angle */
 	float		weight;			/* All: Weight of constraint in IK tree */
@@ -160,7 +159,7 @@ typedef enum B_CONSTRAINT_IK_TYPE {
  */
 typedef struct bSplineIKConstraint {
 		/* target(s) */
-	Object 		*tar;		/* curve object (with follow path enabled) which drives the bone chain */
+	struct Object *tar;		/* curve object (with follow path enabled) which drives the bone chain */
 	
 		/* binding details */
 	float 		*points;	/* array of numpoints items, denoting parametric positions along curve that joints should follow */
@@ -177,7 +176,7 @@ typedef struct bSplineIKConstraint {
 
 /* Track To Constraint */
 typedef struct bTrackToConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			reserved1; /* I'll be using reserved1 and reserved2 as Track and Up flags, not sure if that's what they were intented for anyway. Not sure either if it would create backward incompatibility if I were to rename them. - theeth*/
 	int			reserved2;
 	int			flags;
@@ -187,7 +186,7 @@ typedef struct bTrackToConstraint {
 
 /* Copy Rotation Constraint */
 typedef struct bRotateLikeConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			flag;
 	int			reserved1;
 	char		subtarget[32];
@@ -195,7 +194,7 @@ typedef struct bRotateLikeConstraint {
 
 /* Copy Location Constraint */
 typedef struct bLocateLikeConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			flag;
 	int			reserved1;
 	char		subtarget[32];
@@ -203,7 +202,7 @@ typedef struct bLocateLikeConstraint {
 
 /* Copy Scale Constraint */
 typedef struct bSizeLikeConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			flag;
 	int			reserved1;
 	char		subtarget[32];
@@ -217,13 +216,13 @@ typedef struct bSameVolumeConstraint {
 
 /* Copy Transform Constraint */
 typedef struct bTransLikeConstraint {
-	Object 		*tar;
+	struct Object *tar;
 	char 		subtarget[32];
 } bTransLikeConstraint;
 
 /* Floor Constraint */
 typedef struct bMinMaxConstraint {
-	Object		*tar;
+	struct Object *tar;
 	int			minmaxflag;
 	float		offset;
 	int			flag;
@@ -234,7 +233,7 @@ typedef struct bMinMaxConstraint {
 
 /* Action Constraint */
 typedef struct bActionConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	short		type;	/* what transform 'channel' drives the result */
 	short		local;	/* was used in versions prior to the Constraints recode */
 	int			start;
@@ -248,7 +247,7 @@ typedef struct bActionConstraint {
 
 /* Locked Axis Tracking constraint */
 typedef struct bLockTrackConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			trackflag;
 	int			lockflag;
 	char		subtarget[32];
@@ -256,7 +255,7 @@ typedef struct bLockTrackConstraint {
 
 /* Damped Tracking constraint */
 typedef struct bDampTrackConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			trackflag;
 	int			pad;
 	char		subtarget[32];
@@ -264,7 +263,7 @@ typedef struct bDampTrackConstraint {
 
 /* Follow Path constraints */
 typedef struct bFollowPathConstraint {
-	Object		*tar;			/* Must be path object */
+	struct Object		*tar;		/* Must be path object */
 	
 	float		offset; 		/* Offset in time on the path (in frames), when NOT using 'fixed position' */
 	float 		offset_fac;		/* Parametric offset factor defining position along path, when using 'fixed position' */
@@ -277,7 +276,7 @@ typedef struct bFollowPathConstraint {
 
 /* Stretch to constraint */
 typedef struct bStretchToConstraint {
-	Object		*tar;
+	struct Object		*tar;
 	int			volmode; 
 	int         plane;
 	float		orglength;
@@ -287,8 +286,8 @@ typedef struct bStretchToConstraint {
 
 /* Rigid Body constraint */
 typedef struct bRigidBodyJointConstraint {
-	Object		*tar;
-	Object		*child;
+	struct Object		*tar;
+	struct Object		*child;
 	int         type;
 	float       pivX;
 	float       pivY;
@@ -307,14 +306,14 @@ typedef struct bRigidBodyJointConstraint {
 
 /* Clamp-To Constraint */
 typedef struct bClampToConstraint {
-	Object 		*tar;			/* 'target' must be a curve */
+	struct Object 		*tar;			/* 'target' must be a curve */
 	int			flag;			/* which axis/plane to compare owner's location on  */
 	int			flag2;			/* for legacy reasons, this is flag2. used for any extra settings */
 } bClampToConstraint;
 
 /* Child Of Constraint */
 typedef struct bChildOfConstraint {
-	Object 		*tar;			/* object which will act as parent (or target comes from) */
+	struct Object 		*tar;			/* object which will act as parent (or target comes from) */
 	int 		flag;			/* settings */
 	int			pad;
 	float		invmat[4][4];	/* parent-inverse matrix to use */
@@ -323,7 +322,7 @@ typedef struct bChildOfConstraint {
 
 /* Generic Transform->Transform Constraint */
 typedef struct bTransformConstraint {
-	Object 		*tar;			/* target (i.e. 'driver' object/bone) */
+	struct Object 		*tar;			/* target (i.e. 'driver' object/bone) */
 	char 		subtarget[32];	
 	
 	short		from, to;		/* can be loc(0) , rot(1),  or size(2) */
@@ -342,7 +341,7 @@ typedef struct bPivotConstraint {
 	/* Pivot Point:
 	 *	Either target object + offset, or just offset is used
 	 */
-	Object 		*tar;			/* target object (optional) */
+	struct Object 		*tar;			/* target object (optional) */
 	char	 	subtarget[32];		/* subtarget name (optional) */
 	float 		offset[3];		/* offset from the target to use, regardless of whether it exists */
 	
@@ -385,7 +384,7 @@ typedef struct bSizeLimitConstraint {
 
 /* Limit Distance Constraint */
 typedef struct bDistLimitConstraint {
-	Object 		*tar;
+	struct Object 		*tar;
 	char 		subtarget[32];
 	
 	float 		dist;			/* distance (radius of clamping sphere) from target */
@@ -398,7 +397,7 @@ typedef struct bDistLimitConstraint {
 
 /* ShrinkWrap Constraint */
 typedef struct bShrinkwrapConstraint {
-	Object		*target;
+	struct Object		*target;
 	float		dist;			/* distance to kept from target */
 	short		shrinkType;		/* shrink type (look on MOD shrinkwrap for values) */
 	char		projAxis;		/* axis to project over UP_X, UP_Y, UP_Z */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 2bd95b6f015..273b885f407 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -35,7 +35,7 @@
 
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
-#include "DNA_action_types.h"
+#include "DNA_action_types.h" /* bAnimVizSettings */
 
 #ifdef __cplusplus
 extern "C" {
@@ -556,6 +556,8 @@ typedef enum ObjectMode {
 	OB_MODE_POSE = 64
 } ObjectMode;
 
+#define MAX_DUPLI_RECUR 8
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index d0d9d21e0bd..cc5d256615e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -36,12 +36,12 @@
 extern "C" {
 #endif
 
-#include "DNA_brush_types.h"
 #include "DNA_vec_types.h"
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
 
 struct Object;
+struct Brush;
 struct World;
 struct Scene;
 struct Image;
@@ -345,7 +345,7 @@ typedef struct RenderData {
 	short bake_normal_space, bake_quad_split;
 	float bake_maxdist, bake_biasdist, bake_pad;
 
-	/* paths to backbufffer, output, ftype */
+	/* paths to backbufffer, output */
 	char backbuf[160], pic[160];
 
 	/* stamps flags. */
@@ -507,9 +507,7 @@ typedef struct TimeMarker {
 } TimeMarker;
 
 typedef struct Paint {
-	/* Array of brushes selected for use in this paint mode */
-	Brush **brushes;
-	int active_brush_index, brush_count;
+	struct Brush *brush;
 	
 	/* WM Paint cursor */
 	void *paint_cursor;
@@ -962,8 +960,8 @@ typedef struct Scene {
 /* imtype */
 #define R_TARGA		0
 #define R_IRIS		1
-#define R_HAMX		2
-#define R_FTYPE		3 /* ftype is nomore */
+/* #define R_HAMX		2 */ /* hamx is nomore */
+/* #define R_FTYPE		3 */ /* ftype is nomore */
 #define R_JPEG90	4
 #define R_MOVIE		5
 #define R_IRIZ		7
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index a5299ef081d..f9d482b2159 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -32,12 +32,11 @@
 #define DNA_SEQUENCE_TYPES_H
 
 #include "DNA_listBase.h"
-
-/* needed for sound support */
-#include "DNA_sound_types.h"
+#include "DNA_vec_types.h"
 
 struct Ipo;
 struct Scene;
+struct bSound;
 
 /* strlens; 80= FILE_MAXFILE, 160= FILE_MAXDIR */
 
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 45dff0c96fa..c10d306565b 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -41,18 +41,6 @@ struct Ipo;
 struct PackedFile;
 struct SpaceLink;
 
-typedef struct Sound3D
-{
-	float min_gain;
-	float max_gain;
-	float reference_distance;
-	float max_distance;
-	float rolloff_factor;
-	float cone_inner_angle;
-	float cone_outer_angle;
-	float cone_outer_gain;
-} Sound3D;
-
 typedef struct bSound {
 	ID id;
 
@@ -115,22 +103,6 @@ typedef enum eSound_Type {
 #define SND_DRAWFRAMES	1
 #define SND_CFRA_NUM	2
 
-typedef struct SpaceSound {
-	struct SpaceLink *next, *prev;
-	ListBase regionbase;		/* storage of regions for inactive spaces */
-	int spacetype;
-	float blockscale;
-	struct ScrArea *area;
-	
-	View2D v2d;
-	
-	bSound *sound;
-	short mode, sndnr;
-	short xof, yof;
-	short flag, lock;
-	int pad2;
-} SpaceSound;
-
 #define SOUND_FLAGS_3D					(1 << 3)
 
 /* to DNA_sound_types.h*/
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index ba9d0380c9f..e5308cccdfe 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -42,6 +42,7 @@
 struct ID;
 struct Text;
 struct Script;
+struct bSound;
 struct ImBuf;
 struct Image;
 struct Scopes;
@@ -550,6 +551,22 @@ 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 */
 
 
diff --git a/source/blender/makesdna/DNA_wave_types.h b/source/blender/makesdna/DNA_wave_types.h
deleted file mode 100644
index b05ae862108..00000000000
--- a/source/blender/makesdna/DNA_wave_types.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * blenlib/DNA_wave_types.h (mar-2001 nzc)
- *
- * $Id$ 
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef DNA_WAVE_TYPES_H
-#define DNA_WAVE_TYPES_H
-
-#include "DNA_ID.h"
-
-struct Ipo;
-
-
-/* a Wave has never been implemented... it was meant as a 'free' mathematical
-  deformation object type (ton) */
-
-typedef struct Wave {
-	ID id;
-	
-	struct Ipo *ipo;
-	
-} Wave;
-
-#endif
-
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 15ac26273af..4133afffeed 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -78,7 +78,6 @@ char *includefiles[] = {
 	"DNA_image_types.h",
 	"DNA_texture_types.h",
 	"DNA_lamp_types.h",
-	"DNA_wave_types.h",
 	"DNA_material_types.h",
 	"DNA_vfont_types.h",
 	// if you add files here, please add them at the end
@@ -1128,7 +1127,6 @@ int main(int argc, char ** argv)
 #include "DNA_image_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_lamp_types.h"
-#include "DNA_wave_types.h"
 #include "DNA_material_types.h"
 #include "DNA_vfont_types.h"
 #include "DNA_meta_types.h"