Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T39956.

Browse Source 
Even locked shape keys need to be flushed if user is in textured or
wireframe mode.
This commit is contained in:
Antony Riakiotakis
2014-05-05 22:39:55 +03:00
parent 312d3edee5
commit 4638ca0ebe
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -198,8 +198,7 @@ static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
if (mmd || ob->sculpt->bm) if (mmd || ob->sculpt->bm)
return 0; return 0;
/* non-locked shape keys could be handled in the same way as deformed mesh */ if (me->key && ob->shapenr)
if ((ob->shapeflag & OB_SHAPE_LOCK) == 0 && me->key && ob->shapenr)
return 1; return 1;
md = modifiers_getVirtualModifierList(ob, &virtualModifierData); md = modifiers_getVirtualModifierList(ob, &virtualModifierData);
@@ -3424,7 +3423,7 @@ static void sculpt_flush_stroke_deform(Sculpt *sd, Object *ob)
MEM_freeN(nodes); MEM_freeN(nodes);
/* Modifiers could depend on mesh normals, so we should update them/ /* Modifiers could depend on mesh normals, so we should update them/
* Note, then if sculpting happens on locked key, normals should be re-calculated * Note, then if sculpting happens on key, normals should be re-calculated
* after applying coords from keyblock on base mesh */ * after applying coords from keyblock on base mesh */
BKE_mesh_calc_normals(me); BKE_mesh_calc_normals(me);
} }