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

fix T50899: Even though the Shrinkwrap options hide the possibility of using a non-mesh target, you can still circumvent this... Causing Crash

Browse Source
This commit is contained in:
Germano Cavalcante
2017-03-10 13:51:04 -03:00
parent 103ae04fbc
commit a81ea40836
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/shrinkwrap.c
View File

@@ -588,8 +588,13 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM
DerivedMesh *ss_mesh = NULL; DerivedMesh *ss_mesh = NULL;
ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData; ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData;
/* remove loop dependencies on derived meshes (TODO should this be done elsewhere?) */ /* remove loop dependencies on derived meshes (TODO should this be done elsewhere?)
if (smd->target == ob) smd->target = NULL; * This also ensure the object is of type OBJ_MESH avoiding crash in `object_get_derived_final` (see T50899). */
if (smd->target) {
if (smd->target->type != OB_MESH || smd->target == ob) {
smd->target = NULL;
}
}
if (smd->auxTarget == ob) smd->auxTarget = NULL; if (smd->auxTarget == ob) smd->auxTarget = NULL;