griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T54292: CrazySpace transform calculation error

Browse Source 
The function `modifiers_disable_subsurf_temporary` disables
temporarily only subsurf modifiers with the `On Cage` option enabled.

But a modifier can act on cage even with this option disabled.

Differential Revision: https://developer.blender.org/D6722
This commit is contained in:
mano-wii
2020-01-31 23:58:32 -03:00
parent 26d0f7ed23
commit bf8a26b745
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/crazyspace.c
View File

@@ -81,17 +81,16 @@ static void set_crazy_vertex_quat(float r_quat[4],
sub_qt_qtqt(r_quat, q2, q1);
}
static int modifiers_disable_subsurf_temporary(Object *ob)
static bool modifiers_disable_subsurf_temporary(struct Scene *scene, Object *ob)
{
ModifierData *md;
int disabled = 0;
bool disabled = false;
int cageIndex = modifiers_getCageIndex(scene, ob, NULL, 1);
for (md = ob->modifiers.first; md; md = md->next) {
ModifierData *md = ob->modifiers.first;
for (int i = 0; md && i <= cageIndex; i++, md = md->next) {
if (md->type == eModifierType_Subsurf) {
if (md->mode & eModifierMode_OnCage) {
md->mode ^= eModifierMode_DisableTemporary;
disabled = 1;
}
md->mode ^= eModifierMode_DisableTemporary;
disabled = true;
}
}
@@ -108,7 +107,7 @@ float (*BKE_crazyspace_get_mapped_editverts(struct Depsgraph *depsgraph, Object
BMEditMesh *editmesh_eval = mesh_eval->edit_mesh;
/* disable subsurf temporal, get mapped cos, and enable it */
if (modifiers_disable_subsurf_temporary(obedit_eval)) {
if (modifiers_disable_subsurf_temporary(scene_eval, obedit_eval)) {
/* need to make new derivemesh */
makeDerivedMesh(depsgraph, scene_eval, obedit_eval, editmesh_eval, &CD_MASK_BAREMESH);
}
@@ -122,7 +121,7 @@ float (*BKE_crazyspace_get_mapped_editverts(struct Depsgraph *depsgraph, Object
mesh_get_mapped_verts_coords(mesh_eval_cage, vertexcos, nverts);
/* set back the flag, no new cage needs to be built, transform does it */
modifiers_disable_subsurf_temporary(obedit_eval);
modifiers_disable_subsurf_temporary(scene_eval, obedit_eval);
return vertexcos;
}