[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49048] branches/soc-2012-bratwurst/source /blender/editors/uvedit/uvedit_unwrap_ops.c: Fix silly crash on meshes without modifiers due to own commit

Antony Riakiotakis kalast at gmail.com
Thu Jul 19 00:43:28 CEST 2012


Revision: 49048
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49048
Author:   psy-fi
Date:     2012-07-18 22:43:28 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fix silly crash on meshes without modifiers due to own commit

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2012-07-18 22:29:31 UTC (rev 49047)
+++ branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2012-07-18 22:43:28 UTC (rev 49048)
@@ -186,17 +186,21 @@
 	md = obedit->modifiers.first;
 
 	/* only account for mirroring if first modifier is mirror */
-	if(!(md->type == eModifierType_Mirror))
-		mirror = 0;
+	if(mirror && md && md->type == eModifierType_Mirror)
+		mirror = TRUE;
+	else
+		mirror = FALSE;
 
 	/* subsurf will take the modifier settings only if modifier is first or right after mirror */
 	if (subsurf) {
-		if (mirror) {
+		if (mirror && md) {
 			md = md->next;
 		}
 
-		if (!(md->type == eModifierType_Subsurf))
-			subsurf = 0;
+		if (md && md->type == eModifierType_Subsurf)
+			subsurf = TRUE;
+		else
+			subsurf = FALSE;
 	}
 
 	*use_subsurf = subsurf;




More information about the Bf-blender-cvs mailing list