Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-07-26 14:43:23 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-26 14:43:23 +0400
commit7c58ec9337761291f9489996f2e9d630b0f6ad4e (patch)
tree104dc3dd151bb4412ce47bf42c7086a9181ce8b8 /source/blender/modifiers/intern
parent2945f512ba46f13723c154697b7c7525b0f2aff7 (diff)
use math functions for copying matrix/vector types, also cast const pointers for freeing (clang error's out otherwise)
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r--source/blender/modifiers/intern/MOD_simpledeform.c2
-rw-r--r--source/blender/modifiers/intern/MOD_skin.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index d6dc8482ee2..d260312fe3d 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -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));
}
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index daf0e5c9dc3..91dcf721e4b 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -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);