[Bf-blender-cvs] [4cde92303f3] blender2.8: Fix T56455: [2.8] Crash when projecting skinwrap curve/path.

Bastien Montagne noreply at git.blender.org
Thu Aug 23 21:50:19 CEST 2018


Commit: 4cde92303f3db9286b38d65d835db3e358b595f4
Author: Bastien Montagne
Date:   Thu Aug 23 21:49:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4cde92303f3db9286b38d65d835db3e358b595f4

Fix T56455: [2.8] Crash when projecting skinwrap curve/path.

Shrinkwrap is not only a Mesh modifier...

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

M	source/blender/modifiers/intern/MOD_shrinkwrap.c

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

diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 5497673a52d..c54fbcf7f87 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -108,11 +108,11 @@ static void deformVerts(
 	struct Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
 	Mesh *mesh_src = mesh;
 
-	if (mesh_src == NULL) {
+	if (mesh_src == NULL && ctx->object->type == OB_MESH) {
 		mesh_src = ctx->object->data;
 	}
 
-	BLI_assert(mesh_src->totvert == numVerts);
+	BLI_assert(mesh_src == NULL || mesh_src->totvert == numVerts);
 
 	shrinkwrapModifier_deform((ShrinkwrapModifierData *)md, scene, ctx->object, mesh_src, vertexCos, numVerts);
 }



More information about the Bf-blender-cvs mailing list