[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26951] trunk/blender/source/blender/ editors/object/object_modifier.c: bugfix [#21161] Multiresolution Reshape causes crash

Campbell Barton ideasman42 at gmail.com
Tue Feb 16 11:06:44 CET 2010


Revision: 26951
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26951
Author:   campbellbarton
Date:     2010-02-16 11:06:44 +0100 (Tue, 16 Feb 2010)

Log Message:
-----------
bugfix [#21161] Multiresolution Reshape causes crash
disallow reshape running when the multires mesh isnt available.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_modifier.c

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c	2010-02-16 09:55:07 UTC (rev 26950)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2010-02-16 10:06:44 UTC (rev 26951)
@@ -819,6 +819,11 @@
 	Object *ob= ptr.id.data, *secondob= NULL;
 	MultiresModifierData *mmd= ptr.data;
 
+	if(ob->derivedFinal == NULL || ob->derivedFinal->type != DM_TYPE_CCGDM) {
+		BKE_report(op->reports, RPT_ERROR, "Active objects multires is disabled, can't reshape multires data.");
+		return OPERATOR_CANCELLED;
+	}
+
 	CTX_DATA_BEGIN(C, Object*, selob, selected_editable_objects) {
 		if(selob->type == OB_MESH && selob != ob) {
 			secondob= selob;





More information about the Bf-blender-cvs mailing list