blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T60060: Corrective Smooth Modifier binding process is broken. 

Same as with the other modifiers' binding ops, those need to be
performed outside of regular depsgraph eval.
This commit is contained in:
Bastien Montagne 2019-01-02 11:26:31 +01:00
parent 39e0bfe5a2
commit f15205b93f
Notes: blender-bot 2023-02-14 08:42:54 +01:00 
Referenced by issue #60098, Cycles does not respect the texture alpha mode
Referenced by issue #60068, Viewport shows old cached object names
Referenced by issue #60060, Corrective Smooth Modifier binding process is broken
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/object/object_modifier.c
View File

@ -1880,6 +1880,7 @@ static bool correctivesmooth_poll(bContext *C)
static int correctivesmooth_bind_exec(bContext *C, wmOperator *op)
{
Depsgraph *depsgraph = CTX_data_depsgraph(C);
Scene *scene = CTX_data_scene(C);
Object *ob = ED_object_active_context(C);
CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)edit_modifier_property_get(op, ob, eModifierType_CorrectiveSmooth);
@ -1906,9 +1907,16 @@ static int correctivesmooth_bind_exec(bContext *C, wmOperator *op)
else {
/* signal to modifier to recalculate */
csmd->bind_coords_num = (unsigned int)-1;
/* Force modifier to run, it will call binding routine (this has to happen outside of depsgraph evaluation). */
const int mode = csmd->modifier.mode;
csmd->modifier.mode |= eModifierMode_Realtime;
object_force_modifier_update_for_bind(depsgraph, scene, ob);
csmd->modifier.mode = mode;
}
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
/* We need ID_RECALC_COPY_ON_WRITE to ensure (un)binding is flushed to CoW copies of the object... */
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
return OPERATOR_FINISHED;