kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

use math functions for copying matrix/vector types, also cast const pointers for freeing (clang error's out otherwise)

Browse Source
This commit is contained in:
Campbell Barton 2013-07-26 10:43:23 +00:00
parent 2945f512ba
commit 7c58ec9337
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/editderivedmesh.c
View File

@ -1582,17 +1582,17 @@ static void emDM_release(DerivedMesh *dm)
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);

2
source/blender/bmesh/intern/bmesh_operators.c
View File

@ -411,7 +411,7 @@ void BMO_slot_mat_set(BMOperator *op, BMOpSlot slot_args[BMO_OP_MAX_SLOTS], cons
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);

2
source/blender/modifiers/intern/MOD_simpledeform.c
View File

@ -262,7 +262,7 @@ static void copyData(ModifierData *md, ModifierData *target)
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));
}

2
source/blender/modifiers/intern/MOD_skin.c
View File

@ -690,7 +690,7 @@ static void build_emats_stack(BLI_Stack *stack, int *visited_e, EMat *emat,
/* 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);