Revision: 23893
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23893
Author: blendix
Date: 2009-10-16 17:28:43 +0200 (Fri, 16 Oct 2009)
Log Message:
-----------
Bugfix: sculpting with a multires modifier at level 1 would crash.
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-10-16
13:04:59 UTC (rev 23892)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-10-16
15:28:43 UTC (rev 23893)
@@ -1107,7 +1107,7 @@
it's the last modifier on the stack and it is not on the first level */
static struct MultiresModifierData *sculpt_multires_active(Object *ob)
{
- ModifierData *md;
+ ModifierData *md, *nmd;
for(md= modifiers_getVirtualModifierList(ob); md; md= md->next) {
if(md->type == eModifierType_Multires) {
@@ -1115,12 +1115,11 @@
/* Check if any of the modifiers after multires are
active
* if not it can use the multires struct */
- for (md= md->next; md; md= md->next) {
- if(md->mode & eModifierMode_Realtime)
- return NULL;
- }
+ for (nmd= md->next; nmd; nmd= nmd->next)
+ if(nmd->mode & eModifierMode_Realtime)
+ break;
- if(mmd->lvl != 1)
+ if(!nmd && mmd->lvl != 1)
return mmd;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
