[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34748] trunk/blender/source/blender: small fix so older files are loaded with merge on in the mirror modifiers

Michael Fox mfoxdogg at gmail.com
Thu Feb 10 01:44:29 CET 2011


Revision: 34748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34748
Author:   mfoxdogg
Date:     2011-02-10 00:44:26 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
small fix so older files are loaded with merge on in the mirror modifiers

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_modifier_types.h
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c
    trunk/blender/source/blender/modifiers/intern/MOD_mirror.c

Modified: trunk/blender/source/blender/makesdna/DNA_modifier_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_modifier_types.h	2011-02-10 00:25:00 UTC (rev 34747)
+++ trunk/blender/source/blender/makesdna/DNA_modifier_types.h	2011-02-10 00:44:26 UTC (rev 34748)
@@ -235,7 +235,7 @@
 #define MOD_MIR_AXIS_Y		(1<<4)
 #define MOD_MIR_AXIS_Z		(1<<5)
 #define MOD_MIR_VGROUP		(1<<6)
-#define MOD_MIR_MERGE		(1<<7)
+#define MOD_MIR_NO_MERGE	(1<<7)
 
 typedef struct EdgeSplitModifierData {
 	ModifierData modifier;

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2011-02-10 00:25:00 UTC (rev 34747)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2011-02-10 00:44:26 UTC (rev 34748)
@@ -778,7 +778,7 @@
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 	
 	prop= RNA_def_property(srna, "use_mirror_merge", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_MERGE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", MOD_MIR_NO_MERGE);
 	RNA_def_property_ui_text(prop, "Merge Verticies", "Merge vertices within the merge threshold");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 

Modified: trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_mirror.c	2011-02-10 00:25:00 UTC (rev 34747)
+++ trunk/blender/source/blender/modifiers/intern/MOD_mirror.c	2011-02-10 00:44:26 UTC (rev 34748)
@@ -49,7 +49,7 @@
 {
 	MirrorModifierData *mmd = (MirrorModifierData*) md;
 
-	mmd->flag |= (MOD_MIR_AXIS_X | MOD_MIR_VGROUP | MOD_MIR_MERGE);
+	mmd->flag |= (MOD_MIR_AXIS_X | MOD_MIR_VGROUP);
 	mmd->tolerance = 0.001;
 	mmd->mirror_ob = NULL;
 }
@@ -143,10 +143,10 @@
 			mul_m4_v3(mtx, co);
 		}
 		
-		if(mmd->flag & MOD_MIR_MERGE)
+		if(mmd->flag & MOD_MIR_NO_MERGE)
+			isShared = 0;
+		else
 			isShared = ABS(co[axis])<=tolerance;
-		else
-			isShared = 0;
 		
 		/* Because the topology result (# of vertices) must be the same if
 		* the mesh data is overridden by vertex cos, have to calc sharedness




More information about the Bf-blender-cvs mailing list