[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58619] trunk/blender/source/blender: use math functions for copying matrix/vector types, also cast const pointers for freeing (clang error's out otherwise)

[Campbell Barton]

Revision: 58619
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58619
Author:   campbellbarton
Date:     2013-07-26 10:43:23 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
use math functions for copying matrix/vector types, also cast const pointers for freeing (clang error's out otherwise)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
    trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    trunk/blender/source/blender/modifiers/intern/MOD_skin.c

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-07-26 10:20:02 UTC (rev 58618)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2013-07-26 10:43:23 UTC (rev 58619)
@@ -1582,17 +1582,17 @@
 
 	if (DM_release(dm)) {
 		if (bmdm->vertexCos) {
-			MEM_freeN(bmdm->vertexCos);
+			MEM_freeN((void *)bmdm->vertexCos);
 			if (bmdm->vertexNos) {
-				MEM_freeN(bmdm->vertexNos);
+				MEM_freeN((void *)bmdm->vertexNos);
 			}
 			if (bmdm->polyNos) {
-				MEM_freeN(bmdm->polyNos);
+				MEM_freeN((void *)bmdm->polyNos);
 			}
 		}
 
 		if (bmdm->polyCos) {
-			MEM_freeN(bmdm->polyCos);
+			MEM_freeN((void *)bmdm->polyCos);
 		}
 
 		MEM_freeN(bmdm);

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-07-26 10:20:02 UTC (rev 58618)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2013-07-26 10:43:23 UTC (rev 58619)
@@ -411,7 +411,7 @@
 	slot->data.p = BLI_memarena_alloc(op->arena, sizeof(float) * 4 * 4);
 	
 	if (size == 4) {
-		memcpy(slot->data.p, mat, sizeof(float) * 4 * 4);
+		copy_m4_m4(slot->data.p, (float (*)[4])mat);
 	}
 	else if (size == 3) {
 		copy_m4_m3(slot->data.p, (float (*)[3])mat);

Modified: trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c	2013-07-26 10:20:02 UTC (rev 58618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c	2013-07-26 10:43:23 UTC (rev 58619)
@@ -262,7 +262,7 @@
 	tsmd->axis  = smd->axis;
 	tsmd->origin = smd->origin;
 	tsmd->factor = smd->factor;
-	memcpy(tsmd->limit, smd->limit, sizeof(tsmd->limit));
+	copy_v2_v2(tsmd->limit, smd->limit);
 	BLI_strncpy(tsmd->vgroup_name, smd->vgroup_name, sizeof(tsmd->vgroup_name));
 }
 

Modified: trunk/blender/source/blender/modifiers/intern/MOD_skin.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_skin.c	2013-07-26 10:20:02 UTC (rev 58618)
+++ trunk/blender/source/blender/modifiers/intern/MOD_skin.c	2013-07-26 10:43:23 UTC (rev 58619)
@@ -690,7 +690,7 @@
 	/* Add neighbors to stack */
 	for (i = 0; i < emap[v].count; i++) {
 		/* Add neighbors to stack */
-		memcpy(stack_elem.mat, emat[e].mat, sizeof(float) * 3 * 3);
+		copy_m3_m3(stack_elem.mat, emat[e].mat);
 		stack_elem.e = emap[v].indices[i];
 		stack_elem.parent_v = v;
 		BLI_stack_push(stack, &stack_elem);