[Bf-blender-cvs] [fc2f0a1] blender-v2.77-release: Fix T47749: Crash subdividing wire edge w/ mdisps

Campbell Barton noreply at git.blender.org
Fri Mar 18 12:15:12 CET 2016


Commit: fc2f0a1a25d616a84829df848216501e5318d6dc
Author: Campbell Barton
Date:   Fri Mar 11 10:28:44 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rBfc2f0a1a25d616a84829df848216501e5318d6dc

Fix T47749: Crash subdividing wire edge w/ mdisps

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

M	source/blender/bmesh/intern/bmesh_mods.c

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

diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 84588d9..273d5db 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -600,7 +600,7 @@ BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac)
 	BMFace **oldfaces = NULL;
 	BMEdge *e_dummy;
 	BLI_array_staticdeclare(oldfaces, 32);
-	const int cd_loop_mdisp_offset = CustomData_get_offset(&bm->ldata, CD_MDISPS);
+	const int cd_loop_mdisp_offset = BM_edge_is_wire(e) ? -1 : CustomData_get_offset(&bm->ldata, CD_MDISPS);
 
 	BLI_assert(BM_vert_in_edge(e, v) == true);




More information about the Bf-blender-cvs mailing list