[Bf-blender-cvs] [13b6867d1fd] master: CDDM: correct (disabled) logic in merge verts

Campbell Barton noreply at git.blender.org
Wed Apr 25 14:54:15 CEST 2018


Commit: 13b6867d1fd21721bfd1a46501815faa6f6fa375
Author: Campbell Barton
Date:   Wed Apr 25 14:53:44 2018 +0200
Branches: master
https://developer.blender.org/rB13b6867d1fd21721bfd1a46501815faa6f6fa375

CDDM: correct (disabled) logic in merge verts

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

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

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index d65427a861b..1a34b71643f 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -3003,7 +3003,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int
 	MLoop *ml, *mloop = MEM_malloc_arrayN(totloop, sizeof(*mloop), __func__);
 	int *oldl         = MEM_malloc_arrayN(totloop, sizeof(*oldl), __func__);
 #ifdef USE_LOOPS
-	int newl          = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__);
+	int *newl         = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__);
 #endif
 	STACK_DECLARE(mloop);
 	STACK_DECLARE(oldl);



More information about the Bf-blender-cvs mailing list