[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43235] trunk/blender/source/blender/ blenkernel/intern/multires.c: Fix #29835: joining meshes leads to crash

Sergey Sharybin sergey.vfx at gmail.com
Mon Jan 9 16:17:16 CET 2012


Revision: 43235
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43235
Author:   nazgul
Date:     2012-01-09 15:17:09 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Fix #29835: joining meshes leads to crash

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/multires.c

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2012-01-09 14:08:06 UTC (rev 43234)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2012-01-09 15:17:09 UTC (rev 43235)
@@ -1616,7 +1616,7 @@
 	CustomData_external_read(&me->fdata, &me->id, CD_MASK_MDISPS, me->totface);
 	mdisps= CustomData_get_layer(&me->fdata, CD_MDISPS);
 
-	if(!mdisps || !mmd) return;
+	if(!mdisps || !mmd || !mmd->totlvl) return;
 
 	/* we need derived mesh created from highest resolution */
 	high_mmd= *mmd;



More information about the Bf-blender-cvs mailing list