diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-12-21 05:00:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-12-21 05:02:38 +0300 |
| commit | 32be51dc66ae0e791970c8b7326afa16d60aa267 (patch) | |
| tree | bc3c59d9b70f453e06917a3f47e6a6b9791df96f /source/blender/editors/armature | |
| parent | 6f224941408eda8930489fa440af9539a92badad (diff) | |
Cleanup: warnings (msvc)
Part of patch D1670 by @LazyDodo
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature_retarget.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index 2235f9f92cc..7c09ad49f35 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -82,7 +82,7 @@ static RigGraph *GLOBAL_RIGG = NULL; /*******************************************************************************************************/ -void exec_retargetArctoArc(TaskPool *pool, void *taskdata, int threadid); +void exec_retargetArctoArc(TaskPool * __restrict pool, void *taskdata, int threadid); static void RIG_calculateEdgeAngles(RigEdge *edge_first, RigEdge *edge_second); float rollBoneByQuat(EditBone *bone, float old_up_axis[3], float qrot[4]); @@ -2143,7 +2143,7 @@ static void retargetArctoArc(bContext *C, RigGraph *rigg, RigArc *iarc, RigNode BLI_task_pool_push(rigg->task_pool, exec_retargetArctoArc, p, true, TASK_PRIORITY_HIGH); } -void exec_retargetArctoArc(TaskPool *UNUSED(pool), void *taskdata, int UNUSED(threadid)) +void exec_retargetArctoArc(TaskPool * __restrict UNUSED(pool), void *taskdata, int UNUSED(threadid)) { RetargetParam *p = (RetargetParam *)taskdata; RigGraph *rigg = p->rigg; diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index ce87ffb3494..549b60c2ece 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -576,7 +576,7 @@ static void heat_laplacian_create(LaplacianSystem *sys) static void heat_system_free(LaplacianSystem *sys) { BLI_bvhtree_free(sys->heat.bvhtree); - MEM_freeN(sys->heat.vltree); + MEM_freeN((void *)sys->heat.vltree); MEM_freeN((void *)sys->heat.mlooptri); MEM_freeN(sys->heat.mindist); |