=bmesh= merge from trunk at r36153

17 files changed, 110 insertions, 68 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 1618da90392..412b9bc56f6 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -303,8 +303,8 @@ typedef enum eRotationModes {
 		/* quaternion rotations (default, and for older Blender versions) */
 	ROT_MODE_QUAT	= 0,
 		/* euler rotations - keep in sync with enum in BLI_math.h */
-	ROT_MODE_EUL = 1,		/* Blender 'default' (classic) - must be as 1 to sync with arithb defines */
-	ROT_MODE_XYZ = 1,		/* Blender 'default' (classic) - must be as 1 to sync with arithb defines */
+	ROT_MODE_EUL = 1,		/* Blender 'default' (classic) - must be as 1 to sync with BLI_math_rotation.h defines */
+	ROT_MODE_XYZ = 1,
 	ROT_MODE_XZY,
 	ROT_MODE_YXZ,
 	ROT_MODE_YZX,
@@ -511,7 +511,8 @@ typedef struct bDopeSheet {
 	ID 		*source;			/* currently ID_SCE (for Dopesheet), and ID_SC (for Grease Pencil) */
 	ListBase chanbase;			/* cache for channels (only initialised when pinned) */  // XXX not used!
 	
-	struct Group *filter_grp;	/* object group for ADS_FILTER_ONLYOBGROUP filtering option */ 
+	struct Group *filter_grp;	/* object group for ADS_FILTER_ONLYOBGROUP filtering option */
+	char searchstr[64];			/* string to search for in displayed names of F-Curves for ADS_FILTER_BY_FCU_NAME filtering option */
 	
 	int filterflag;				/* flags to use for filtering data */
 	int flag;					/* standard flags */
@@ -554,6 +555,7 @@ typedef enum eDopeSheet_FilterFlag {
 	
 		/* general filtering 3 */
 	ADS_FILTER_INCL_HIDDEN		= (1<<26),	/* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
+	ADS_FILTER_BY_FCU_NAME		= (1<<27),	/* for F-Curves, filter by the displayed name (i.e. to isolate all Location curves only) */
 	
 		/* combination filters (some only used at runtime) */
 	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR|ADS_FILTER_NOPART|ADS_FILTER_NOARM)
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 31e02ff1877..4b649031f97 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -261,7 +261,7 @@ typedef enum eFMod_Stepped_Flags {
  * Defines how to access a dependency needed for a driver variable.
  */
 typedef struct DriverTarget {
-	ID 	*id;				/* ID-block which owns the target */
+	ID 	*id;				/* ID-block which owns the target, no user count */
 	
 	char *rna_path;			/* RNA path defining the setting to use (for DVAR_TYPE_SINGLE_PROP) */
 	
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index ffccc08048e..6eb5f64ffc3 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -119,6 +119,8 @@ typedef struct bGPDlayer {
 #define GP_LAYER_SELECT		(1<<5)
 	/* current frame for layer can't be changed */
 #define GP_LAYER_FRAMELOCK	(1<<6)
+	/* don't render xray (which is default) */
+#define GP_LAYER_NO_XRAY	(1<<7)
 
 
 /* Grease-Pencil Annotations - 'DataBlock' */
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 860da1d80a4..1489593f7f6 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -160,7 +160,8 @@ typedef struct Material {
 	short sss_flag, sss_preset;
 
 	int mapto_textured;	/* render-time cache to optimise texture lookups */
-	int pad4;
+	short shadowonly_flag;		/* "shadowsonly" type */
+	short pad;
 
 	ListBase gpumaterial;		/* runtime */
 } Material;
@@ -238,6 +239,11 @@ typedef struct Material {
 #define MA_RAYMIR_FADETOSKY	0
 #define MA_RAYMIR_FADETOMAT	1
 
+/* shadowonly_flag */
+#define MA_SO_OLD			0
+#define MA_SO_SHADOW		1
+#define MA_SO_SHADED		2
+
 /* shade_flag */
 #define MA_CUBIC			1
 #define MA_OBCOLOR			2
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index ec30a01c8e2..d505b22c773 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -63,8 +63,6 @@ typedef struct Mesh {
 	struct AnimData *adt;		/* animation data (must be immediately after id for utilities to use it) */
 
 	struct BoundBox *bb;
-
-	ListBase effect;
 	
 	struct Ipo *ipo;		// XXX depreceated... old animation system
 	struct Key *key;
@@ -104,22 +102,20 @@ typedef struct Mesh {
 	 * of the last selected face and is similar to the old active face flag where
 	 * the face does not need to be selected, -1 is inactive */
 	int act_face; 
-	
-	short texflag, editflag;
-	
+
 	/* texture space, copied as one block in editobject.c */
 	float loc[3];
 	float size[3];
 	float rot[3];
-	
-	float cubemapsize;
-	
-	int drawflag;
+
+	short texflag, drawflag;
 	short smoothresh, flag;
 
 	short subdiv, subdivr;
+	char subsurftype;		/* only kept for backwards compat, not used anymore */
+	char editflag;
+
 	short totcol;
-	short subsurftype;		/* only kept for backwards compat, not used anymore */
 
 	struct Multires *mr;		/* Multiresolution modeling data */
 	struct PartialVisibility *pv;
@@ -145,7 +141,7 @@ typedef struct TFace {
 #define ME_EDIT_MIRROR_Z (1 << 2) // unused so far
 
 #define ME_EDIT_PAINT_MASK (1 << 3)
-#define ME_EDIT_MIRROR_TOPO (1 << 4) // unused so far
+#define ME_EDIT_MIRROR_TOPO (1 << 4)
 
 
 /* me->flag */
@@ -160,7 +156,7 @@ typedef struct TFace {
 #define ME_OPT_EDGES	256
 #define ME_DS_EXPAND	512
 
-/* me->drawflag, int */ 
+/* me->drawflag, short */
 #define ME_DRAWEDGES	(1 << 0)
 #define ME_DRAWFACES	(1 << 1)
 #define ME_DRAWNORMALS	(1 << 2)
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index e5d37c5e43e..62f14d4b8fe 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -475,7 +475,7 @@ typedef struct CollisionModifierData {
 	
 	unsigned int numverts;
 	unsigned int numfaces;
-	float time, pad;		/* cfra time of modifier */
+	float time_x, time_xnew;		/* cfra time of modifier */
 	struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */
 } CollisionModifierData;
 
@@ -706,13 +706,16 @@ typedef struct SolidifyModifierData {
 	float crease_outer;
 	float crease_rim;
 	int flag;
+	short mat_ofs;
+	short mat_ofs_rim;
+	int pad;
 } SolidifyModifierData;
 
 #define MOD_SOLIDIFY_RIM			(1<<0)
 #define MOD_SOLIDIFY_EVEN			(1<<1)
 #define MOD_SOLIDIFY_NORMAL_CALC	(1<<2)
 #define MOD_SOLIDIFY_VGROUP_INV		(1<<3)
-#define MOD_SOLIDIFY_RIM_MATERIAL	(1<<4)
+#define MOD_SOLIDIFY_RIM_MATERIAL	(1<<4) /* deprecated, used in do_versions */
 
 typedef struct ScrewModifierData {
 	ModifierData modifier;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 803e5418bcc..03387c3a63a 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -136,7 +136,8 @@ typedef struct bNode {
 	void *storage;			/* custom data, must be struct, for storage in file */
 	
 	float locx, locy;		/* root offset for drawing */
-	float width, miniwidth;			
+	float width, miniwidth;
+	char label[32];			/* custom user-defined label */
 	short custom1, custom2;	/* to be abused for buttons */
 	float custom3, custom4;
 	
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 5b4fc2e554f..fb04e001cad 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -145,7 +145,13 @@ typedef struct Object {
 	float obmat[4][4];		/* final worldspace matrix with constraints & animsys applied */
 	float parentinv[4][4]; /* inverse result of parent, so that object doesn't 'stick' to parent */
 	float constinv[4][4]; /* inverse result of constraints. doesn't include effect of parent or object local transform */
-	float imat[4][4];	/* inverse matrix of 'obmat' for during render, old game engine, temporally: ipokeys of transform  */
+	float imat[4][4];	/* inverse matrix of 'obmat' for any other use than rendering! */
+	
+	/* Previously 'imat' was used at render time, but as other places use it too
+	 * the interactive ui of 2.5 creates problems. So now only 'imat_ren' should
+	 * be used when ever the inverse of ob->obmat * re->viewmat is needed! - jahka
+	 */
+	float imat_ren[4][4];
 	
 	unsigned int lay;				/* copy of Base */
 	
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index ae97b023e58..09053848b28 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -123,16 +123,23 @@ typedef struct ParticleData {
 
 typedef struct SPHFluidSettings {
 	/*Particle Fluid*/
-	float spring_k, radius, rest_length, plasticity_constant, yield_ratio;
+	float radius, spring_k, rest_length;
+	float plasticity_constant, yield_ratio;
+	float plasticity_balance, yield_balance;
 	float viscosity_omega, viscosity_beta;
 	float stiffness_k, stiffness_knear, rest_density;
 	float buoyancy;
-	int flag, pad;
+	int flag, spring_frames;
 } SPHFluidSettings;
 
 /* fluid->flag */
 #define SPH_VISCOELASTIC_SPRINGS	1
 #define SPH_CURRENT_REST_LENGTH		2
+#define SPH_FAC_REPULSION			4
+#define SPH_FAC_DENSITY				8
+#define SPH_FAC_RADIUS				16
+#define SPH_FAC_VISCOSITY			32
+#define SPH_FAC_REST_LENGTH			64
 
 typedef struct ParticleSettings {
 	ID id;
@@ -143,12 +150,12 @@ typedef struct ParticleSettings {
 
 	struct EffectorWeights *effector_weights;
 
-	int flag;
+	int flag, rt;
 	short type, from, distr, texact;
 	/* physics modes */
 	short phystype, rotmode, avemode, reactevent;
 	short draw, draw_as, draw_size, childtype;
-	short ren_as, subframes;
+	short ren_as, subframes, draw_col;
 	/* number of path segments, power of 2 except */
 	short draw_step, ren_step;
 	short hair_step, keys_step;
@@ -157,12 +164,15 @@ typedef struct ParticleSettings {
 	short adapt_angle, adapt_pix;
 
 	short disp, omat, interpolation, rotfrom, integrator;
-	short kink, kink_axis, rt2;
+	short kink, kink_axis;
 
 	/* billboards */
 	short bb_align, bb_uv_split, bb_anim, bb_split_offset;
 	float bb_tilt, bb_rand_tilt, bb_offset[2];
 
+	/* draw color */
+	float color_vec_max;
+
 	/* simplification */
 	short simplify_flag, simplify_refsize;
 	float simplify_rate, simplify_transition;
@@ -249,9 +259,9 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 	char name[32];							/* particle system name */
 	
 	float imat[4][4];	/* used for duplicators */
-	float cfra, tree_frame;
+	float cfra, tree_frame, bvhtree_frame;
 	int seed, child_seed;
-	int flag, totpart, totunexist, totchild, totcached, totchildcache, rt;
+	int flag, totpart, totunexist, totchild, totcached, totchildcache;
 	short recalc, target_psys, totkeyed, bakespace;
 
 	char bb_uvname[3][32];					/* billboard uv name */
@@ -271,7 +281,8 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 	ParticleSpring *fluid_springs;
 	int tot_fluidsprings, alloc_fluidsprings;
 
-	struct KDTree *tree;					/* used for interactions with self and other systems */
+	struct KDTree *tree;								/* used for interactions with self and other systems */
+	struct BVHTree *bvhtree;								/* used for interactions with self and other systems */
 
 	struct ParticleDrawData *pdd;
 
@@ -339,7 +350,7 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_FROM_VERT		0
 #define PART_FROM_FACE		1
 #define PART_FROM_VOLUME	2
-#define PART_FROM_PARTICLE	3
+/* #define PART_FROM_PARTICLE	3  deprecated! */ 
 #define PART_FROM_CHILD		4
 
 /* part->distr */
@@ -375,10 +386,17 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_DRAW_RAND_GR	1024
 #define PART_DRAW_REN_ADAPT	2048
 #define PART_DRAW_VEL_LENGTH	(1<<12)
-#define PART_DRAW_MAT_COL		(1<<13)
+#define PART_DRAW_MAT_COL		(1<<13) /* deprecated, but used in do_versions */
 #define PART_DRAW_WHOLE_GR		(1<<14)
 #define PART_DRAW_REN_STRAND	(1<<15)
 
+/* part->draw_col */
+#define PART_DRAW_COL_NONE		0
+#define PART_DRAW_COL_MAT		1
+#define PART_DRAW_COL_VEL		2
+#define PART_DRAW_COL_ACC		3
+
+
 /* part->simplify_flag */
 #define PART_SIMPLIFY_ENABLE	1
 #define PART_SIMPLIFY_VIEWPORT	2
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index e3057e862b8..b1586068220 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -726,9 +726,11 @@ typedef struct ToolSettings {
 	
 	/* Alt+RMB option */
 	char edge_mode;
+	char edge_mode_live_unwrap;
 
 	/* Transform */
-	short snap_mode, snap_flag, snap_target;
+	char snap_mode;
+	short snap_flag, snap_target;
 	short proportional, prop_mode;
 	char proportional_objects; /* proportional edit, object mode */
 	char pad[3];
@@ -781,7 +783,9 @@ typedef struct Scene {
 	
 	unsigned int lay;			/* bitflags for layer visibility */
 	int layact;		/* active layer */
+	unsigned int lay_updated;       /* runtime flag, has layer ever been updated since load? */
 	unsigned int customdata_mask;	/* XXX. runtime flag for drawing, actually belongs in the window, only used by object_handle_update() */
+	unsigned int customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */
 	
 	short flag;								/* various settings */
 	
@@ -1039,9 +1043,9 @@ typedef struct Scene {
 
 /* depricate this! */
 #define TESTBASE(v3d, base)	( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
-#define TESTBASELIB(v3d, base)	( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
-#define TESTBASELIB_BGMODE(v3d, scene, base)   ( ((base)->flag & SELECT) && ((base)->lay & (v3d ? v3d->lay : scene->lay)) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
-#define BASE_EDITABLE_BGMODE(v3d, scene, base)   (((base)->lay & (v3d ? v3d->lay : scene->lay)) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
+#define TESTBASELIB(v3d, base)	( ((base)->flag & SELECT) && ((base)->lay & v3d->lay) && ((base)->object->id.lib==NULL) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
+#define TESTBASELIB_BGMODE(v3d, scene, base)   ( ((base)->flag & SELECT) && ((base)->lay & (v3d ? v3d->lay : scene->lay)) && ((base)->object->id.lib==NULL) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
+#define BASE_EDITABLE_BGMODE(v3d, scene, base)   (((base)->lay & (v3d ? v3d->lay : scene->lay)) && ((base)->object->id.lib==NULL) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
 #define BASE_SELECTABLE(v3d, base)	 ((base->lay & v3d->lay) && (base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0)
 #define BASE_VISIBLE(v3d, base)	 ((base->lay & v3d->lay) && (base->object->restrictflag & OB_RESTRICT_VIEW)==0)
 #define FIRSTBASE		scene->base.first
@@ -1059,9 +1063,9 @@ typedef struct Scene {
 #define PRVRANGEON		(scene->r.flag & SCER_PRV_RANGE)
 #define PSFRA			((PRVRANGEON)? (scene->r.psfra): (scene->r.sfra))
 #define PEFRA			((PRVRANGEON)? (scene->r.pefra): (scene->r.efra))
-#define FRA2TIME(a)           ((((double) scene->r.frs_sec_base) * (a)) / scene->r.frs_sec)
-#define TIME2FRA(a)           ((((double) scene->r.frs_sec) * (a)) / scene->r.frs_sec_base)
-#define FPS                     (((double) scene->r.frs_sec) / scene->r.frs_sec_base)
+#define FRA2TIME(a)           ((((double) scene->r.frs_sec_base) * (double)(a)) / (double)scene->r.frs_sec)
+#define TIME2FRA(a)           ((((double) scene->r.frs_sec) * (double)(a)) / (double)scene->r.frs_sec_base)
+#define FPS                     (((double) scene->r.frs_sec) / (double)scene->r.frs_sec_base)
 
 #define RAD_PHASE_PATCHES	1
 #define RAD_PHASE_FACES		2
@@ -1176,7 +1180,7 @@ typedef enum SculptFlags {
 
 /* 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_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->uv_flag */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 381046daedc..cd19f4cb3de 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -184,6 +184,8 @@ typedef struct ARegion {
 #define AREA_FLAG_DRAWJOINTO	2
 #define AREA_FLAG_DRAWJOINFROM	4
 #define AREA_TEMP_INFO			8
+#define AREA_FLAG_DRAWSPLIT_H	16
+#define AREA_FLAG_DRAWSPLIT_V	32
 
 /* If you change EDGEWIDTH, also do the global arrat edcol[]  */
 #define EDGEWIDTH	1
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index a23aed505ae..7cb0c9456db 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -178,22 +178,19 @@ typedef struct FileSelectParams {
 
 	char filter_glob[64]; /* list of filetypes to filter */
 
+	int	active_file;
+	int sel_first;
+	int sel_last;
+
+	/* short */
 	short type; /* XXXXX for now store type here, should be moved to the operator */
 	short flag; /* settings for filter, hiding dots files,...  */
 	short sort; /* sort order */
 	short display; /* display mode flag */
 	short filter; /* filter when (flags & FILE_FILTER) is true */
 
-	/* XXX - temporary, better move to filelist */
-	short active_bookmark;
-
-	int	active_file;
-	int selstate;
-
-	/* short */
 	/* XXX --- still unused -- */
 	short f_fp; /* show font preview */
-	short pad;
 	char fp_str[8]; /* string to use for font preview */
 
 	/* XXX --- end unused -- */
@@ -406,6 +403,7 @@ typedef struct SpaceNode {
 	int treetype;		/* treetype: as same nodetree->type */
 	short texfrom;		/* texfrom object, world or brush */
 	short recalc;		/* currently on 0/1, for auto compo */
+	ListBase linkdrag;	/* temporary data for modal linking operator */
 	
 	struct bGPdata *gpd;		/* grease-pencil data */
 } SpaceNode;
@@ -711,9 +709,7 @@ enum FileSortTypeE {
 #define FILE_BOOKMARKS		512
 #define FILE_GROUP_INSTANCE	1024
 
-/* files in filesel list: 2=ACTIVE  */
-#define EDITING				(1<<0)
-#define ACTIVEFILE			(1<<1)
+/* files in filesel list: file types */
 #define BLENDERFILE			(1<<2)
 #define BLENDERFILE_BACKUP	(1<<3)
 #define IMAGEFILE			(1<<4)
@@ -728,6 +724,13 @@ enum FileSortTypeE {
 #define COLLADAFILE			(1<<13)
 #define OPERATORFILE		(1<<14) /* from filter_glob operator property */
 
+
+/* Selection Flags in filesel: struct direntry, unsigned char selflag */
+#define ACTIVE_FILE 		(1<<1)
+#define HILITED_FILE		(1<<2)
+#define SELECTED_FILE		(1<<3)
+#define EDITING_FILE		(1<<4)
+
 /* SpaceImage->dt_uv */
 #define SI_UVDT_OUTLINE	0
 #define SI_UVDT_DASH	1
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index d66f612155a..3672e28644a 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -219,8 +219,8 @@ typedef struct ThemeSpace {
 	char console_output[4], console_input[4], console_info[4], console_error[4];
 	char console_cursor[4];
 	
-	char vertex_size, facedot_size;
-	char bpad[2];
+	char vertex_size, outline_width, facedot_size;
+	char bpad;
 
 	char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
 	char syntaxv[4], syntaxc[4];
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 3ffef475e1b..c9a440522d1 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -41,7 +41,6 @@ struct SpaceLink;
 struct Base;
 struct BoundBox;
 struct RenderInfo;
-struct RetopoViewData;
 struct bGPdata;
 struct SmoothViewStore;
 struct wmTimer;
@@ -113,9 +112,8 @@ typedef struct RegionView3D {
 	
 	struct bGPdata *gpd;		/* Grease-Pencil Data (annotation layers) */
 	
-	struct RegionView3D *localvd;
+	struct RegionView3D *localvd; /* allocated backup of its self while in localview */
 	struct RenderInfo *ri;
-	struct RetopoViewData *retopo_view_data;
 	struct ViewDepths *depths;
 	
 	/* animated smooth view */
@@ -153,7 +151,7 @@ typedef struct View3D {
 	struct ListBase bgpicbase;
 	struct BGpic *bgpic; /* deprecated, use bgpicbase, only kept for do_versions(...) */
 
-	struct View3D *localvd;
+	struct View3D *localvd; /* allocated backup of its self while in localview */
 	
 	char ob_centre_bone[32];		/* optional string for armature bone to define center */
 	
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 1325272d94f..769f0ad17db 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -85,7 +85,8 @@ typedef enum ReportType {
 enum ReportListFlags {
 	RPT_PRINT = 1,
 	RPT_STORE = 2,
-	RPT_FREE = 4
+	RPT_FREE = 4,
+	RPT_OP_HOLD = 8 /* dont move them into the operator global list (caller will use) */
 };
 #
 #
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 3b6aafaffa0..e0e521a81d5 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -170,7 +170,7 @@ static int le_int(int temp)
 int DNA_elem_array_size(const char *astr, int len)
 {
 	int a, mul=1;
-	char str[100], *cp=0;
+	char str[100], *cp= NULL;
 
 	memcpy(str, astr, len+1);
 
@@ -194,7 +194,7 @@ int DNA_elem_array_size(const char *astr, int len)
 void DNA_sdna_free(SDNA *sdna)
 {
 	MEM_freeN(sdna->data);
-	MEM_freeN(sdna->names);
+	MEM_freeN((void *)sdna->names);
 	MEM_freeN(sdna->types);
 	MEM_freeN(sdna->structs);
 	
@@ -259,7 +259,7 @@ static void printstruct(SDNA *sdna, short strnr)
 static short *findstruct_name(SDNA *sdna, const char *str)
 {
 	int a;
-	short *sp=0;
+	short *sp= NULL;
 
 
 	for(a=0; a<sdna->nr_structs; a++) {
@@ -269,12 +269,12 @@ static short *findstruct_name(SDNA *sdna, const char *str)
 		if(strcmp( sdna->types[ sp[0] ], str )==0) return sp;
 	}
 	
-	return 0;
+	return NULL;
 }
 
 int DNA_struct_find_nr(SDNA *sdna, const char *str)
 {
-	short *sp=0;
+	short *sp= NULL;
 	int a;
 
 	if(sdna->lastfind<sdna->nr_structs) {
@@ -808,12 +808,12 @@ static char *find_elem(SDNA *sdna, const char *type, const char *name, short *ol
 				return olddata;
 			}
 			
-			return 0;
+			return NULL;
 		}
 		
 		olddata+= len;
 	}
-	return 0;
+	return NULL;
 }
 
 static void reconstruct_elem(SDNA *newsdna, SDNA *oldsdna, char *type, const char *name, char *curdata, short *old, char *olddata)
@@ -999,7 +999,7 @@ void DNA_struct_switch_endian(SDNA *oldsdna, int oldSDNAnr, char *data)
 		/* test: is type a struct? */
 		if(spc[0]>=firststructtypenr  &&  !ispointer(name)) {
 			/* where does the old data start (is there one?) */
-			cpo= find_elem(oldsdna, type, name, spo, data, 0);
+			cpo= find_elem(oldsdna, type, name, spo, data, NULL);
 			if(cpo) {
 				oldSDNAnr= DNA_struct_find_nr(oldsdna, type);
 				
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 711d7a08687..47ddbc59580 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -615,7 +615,7 @@ int convert_include(char *filename)
 										sp[0]= type;
 										sp[1]= name;
 
-										if ((debugSDNA>1) && (names[name] != 0 )) printf("%s |", names[name]);
+										if ((debugSDNA>1) && (names[name] != NULL)) printf("%s |", names[name]);
 
 										structpoin[1]++;
 										sp+= 2;
@@ -630,7 +630,7 @@ int convert_include(char *filename)
 
 									sp[0]= type;
 									sp[1]= name;
-									if ((debugSDNA > 1) && (names[name] != 0 )) printf("%s ||", names[name]);
+									if ((debugSDNA > 1) && (names[name] != NULL)) printf("%s ||", names[name]);
 
 									structpoin[1]++;
 									sp+= 2;
@@ -660,7 +660,7 @@ int convert_include(char *filename)
 int arraysize(char *astr, int len)
 {
 	int a, mul=1;
-	char str[100], *cp=0;
+	char str[100], *cp=NULL;
 
 	memcpy(str, astr, len+1);