From 9a6332bea9ba327c22e0097bf09f7acd68dd5ff6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 16 Feb 2010 10:06:44 +0000 Subject: bugfix [#21161] Multiresolution Reshape causes crash disallow reshape running when the multires mesh isnt available. --- source/blender/editors/object/object_modifier.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/editors') diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index a4cef0634ee..472c3038d6a 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -819,6 +819,11 @@ static int multires_reshape_exec(bContext *C, wmOperator *op) 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; -- cgit v1.2.3