[Bf-blender-cvs] [e1a53b6] master: Fix T44475: Merge option of Mirror Modifier behavior reversed.

Bastien Montagne noreply at git.blender.org
Wed Apr 22 07:55:36 CEST 2015


Commit: e1a53b6d52f1ce3598e9e35b96eaab2318aba4ad
Author: Bastien Montagne
Date:   Wed Apr 22 07:54:14 2015 +0200
Branches: master
https://developer.blender.org/rBe1a53b6d52f1ce3598e9e35b96eaab2318aba4ad

Fix T44475: Merge option of Mirror Modifier behavior reversed.

Glitch in rB57d9badc.

===================================================================

M	source/blender/modifiers/intern/MOD_mirror.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index d34d68d..73bc61e 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -94,7 +94,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
                                    int axis)
 {
 	const float tolerance_sq = mmd->tolerance * mmd->tolerance;
-	const bool do_vtargetmap = (mmd->flag & MOD_MIR_NO_MERGE) != 0;
+	const bool do_vtargetmap = (mmd->flag & MOD_MIR_NO_MERGE) == 0;
 	int tot_vtargetmap = 0;  /* total merge vertices */
 
 	DerivedMesh *result;




More information about the Bf-blender-cvs mailing list