soc-2008-mxcurioni: merged changes to revision 14747, cosmetic changes for source/blender/freestyle

3 files changed, 24 insertions, 14 deletions

diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 8122cdd9cc7..e5f781a3365 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -171,24 +171,24 @@ typedef struct ParticleSettings {
 typedef struct ParticleSystem{
 	struct ParticleSystem *next, *prev;
 
-	ParticleSettings *part;
+	ParticleSettings *part;					/* particle settings */
 
-	ParticleData *particles;
+	ParticleData *particles;				/* (parent) particles */
+	ChildParticle *child;					/* child particles */
 
-	ChildParticle *child;
+	struct ParticleEdit *edit;				/* particle editmode (runtime) */
 
-	struct ParticleEdit *edit;
+	struct ParticleCacheKey **pathcache;	/* path cache (runtime) */
+	struct ParticleCacheKey **childcache;	/* child cache (runtime) */
+	ListBase pathcachebufs, childcachebufs;	/* buffers for the above */
 
-	struct ParticleCacheKey **pathcache;
-	struct ParticleCacheKey **childcache;
-
-	struct SoftBody *soft;
+	struct SoftBody *soft;					/* hair softbody */
 
 	struct Object *target_ob;
 	struct Object *keyed_ob;
 	struct Object *lattice;
 
-	struct ListBase effectors, reactevents;
+	struct ListBase effectors, reactevents;	/* runtime */
 	
 	float imat[4][4];	/* used for duplicators */
 	float cfra;
@@ -196,10 +196,10 @@ typedef struct ParticleSystem{
 	int flag, totpart, totchild, totcached, totchildcache, rt;
 	short recalc, target_psys, keyed_psys, totkeyed, softflag, bakespace;
 
-	char bb_uvname[3][32];
+	char bb_uvname[3][32];					/* billboard uv name */
 
 	/* if you change these remember to update array lengths to PSYS_TOT_VG! */
-	short vgroup[11], vg_neg, rt3[2];
+	short vgroup[11], vg_neg, rt3[2];		/* vertex groups */
 
 	/* temporary storage during render */
 	void *renderdata;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index e0e8c351d2c..45833695ffe 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -437,7 +437,9 @@ typedef struct ToolSettings {
 	char  skgen_postpro_passes;
 	char  skgen_subdivisions[3];
 	
-	char pad3[5];
+	/* Alt+RMB option */
+	char edge_mode;
+	char pad3[4];
 } ToolSettings;
 
 /* Used by all brushes to store their properties, which can be directly set
@@ -783,6 +785,13 @@ typedef struct Scene {
 #define UVCALC_FILLHOLES			1
 #define UVCALC_NO_ASPECT_CORRECT	2	/* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
 
+/* toolsettings->edge_mode */
+#define EDGE_MODE_SELECT				0
+#define EDGE_MODE_TAG_SEAM				1
+#define EDGE_MODE_TAG_SHARP				2
+#define EDGE_MODE_TAG_CREASE			3
+#define EDGE_MODE_TAG_BEVEL				4
+
 /* toolsettings->particle flag */
 #define PE_KEEP_LENGTHS			1
 #define PE_LOCK_FIRST			2
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index c45571cb583..acc1651e9fa 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -224,7 +224,7 @@ extern UserDef U; /* from usiblender.c !!!! */
 #define USER_DUPLILINK			(1 << 6)
 #define USER_FSCOLLUM			(1 << 7)
 #define USER_MAT_ON_OB			(1 << 8)
-#define USER_NO_CAPSLOCK		(1 << 9)
+/*#define USER_NO_CAPSLOCK		(1 << 9)*/ /* not used anywhere */
 #define USER_VIEWMOVE			(1 << 10)
 #define USER_TOOLTIPS			(1 << 11)
 #define USER_TWOBUTTONMOUSE		(1 << 12)
@@ -236,7 +236,8 @@ extern UserDef U; /* from usiblender.c !!!! */
 #define USER_ADD_EDITMODE		(1 << 18)
 #define USER_ADD_VIEWALIGNED	(1 << 19)
 #define USER_RELPATHS			(1 << 20)
-#define USER_DRAGIMMEDIATE			(1 << 21)
+#define USER_DRAGIMMEDIATE		(1 << 21)
+#define USER_DONT_DOSCRIPTLINKS	(1 << 22)
 
 /* viewzom */
 #define USER_ZOOM_CONT			0