[Bf-blender-cvs] [a81ea408367] master: fix T50899: Even though the Shrinkwrap options hide the possibility of using a non-mesh target, you can still circumvent this... Causing Crash

[Germano Cavalcante]

Commit: a81ea408367abe2f33b351ff6dcc6b09170fd088
Author: Germano Cavalcante
Date:   Fri Mar 10 13:51:04 2017 -0300
Branches: master
https://developer.blender.org/rBa81ea408367abe2f33b351ff6dcc6b09170fd088

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

===================================================================

M	source/blender/blenkernel/intern/shrinkwrap.c

===================================================================

diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 7094d5a3547..afb3aa7e15e 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -588,8 +588,13 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM
 	DerivedMesh *ss_mesh    = NULL;
 	ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData;
 
-	/* remove loop dependencies on derived meshes (TODO should this be done elsewhere?) */
-	if (smd->target == ob) smd->target = NULL;
+	/* remove loop dependencies on derived meshes (TODO should this be done elsewhere?)
+	 * 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;