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 | |
parent | 6f224941408eda8930489fa440af9539a92badad (diff) |
Cleanup: warnings (msvc)
Part of patch D1670 by @LazyDodo
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/editarmature_retarget.c | 4 | ||||
-rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 2 | ||||
-rw-r--r-- | source/blender/editors/curve/curve_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_transform.h | 4 | ||||
-rw-r--r-- | source/blender/editors/mask/mask_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/clip_editor.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 4 |
9 files changed, 12 insertions, 12 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); diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index 29904bf2344..ce7487f5a90 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -134,7 +134,7 @@ bool ED_curve_pick_vert( /* helper functions */ void ed_editnurb_translate_flag(struct ListBase *editnurb, short flag, const float vec[3]); -bool ed_editnurb_extrude_flag(struct EditNurb *editnurb, short flag); +bool ed_editnurb_extrude_flag(struct EditNurb *editnurb, const short flag); bool ed_editnurb_spin(float viewmat[4][4], struct Object *obedit, const float axis[3], const float cent[3]); /* editcurve_select.c */ diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index 19bfb94e130..73f7cd2ba7c 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -196,13 +196,13 @@ bool snapObjectsContext( /* taks args for all settings */ bool snapObjectsEx( struct Scene *scene, struct View3D *v3d, struct ARegion *ar, struct Base *base_act, struct Object *obedit, - const float mval[2], SnapSelect snap_select, short snap_mode, + const float mval[2], SnapSelect snap_select, const short snap_mode, float *ray_depth, /* return args */ float r_loc[3], float r_no[3], float *r_dist_px); bool snapObjectsRayEx( struct Scene *scene, struct View3D *v3d, struct ARegion *ar, struct Base *base_act, struct Object *obedit, - const float mval[2], SnapSelect snap_select, short snap_mode, + const float mval[2], SnapSelect snap_select, const short snap_mode, const float ray_start[3], const float ray_normal[3], float *ray_depth, /* return args */ float r_loc[3], float r_no[3], float *r_dist_px, int *r_index, diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index 2efa9e211c9..727c2d8adc8 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -669,7 +669,7 @@ typedef struct ThreadedMaskRasterizeData { int num_scanlines; } ThreadedMaskRasterizeData; -static void mask_rasterize_func(TaskPool *pool, void *taskdata, int UNUSED(threadid)) +static void mask_rasterize_func(TaskPool * __restrict pool, void *taskdata, int UNUSED(threadid)) { ThreadedMaskRasterizeState *state = (ThreadedMaskRasterizeState *) BLI_task_pool_userdata(pool); ThreadedMaskRasterizeData *data = (ThreadedMaskRasterizeData *) taskdata; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 2685581a81d..4e85d89ab4b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3638,7 +3638,7 @@ static void project_paint_build_proj_ima( projIma->partRedrawRect = BLI_memarena_alloc(arena, sizeof(ImagePaintPartialRedraw) * PROJ_BOUNDBOX_SQUARED); memset(projIma->partRedrawRect, 0, sizeof(ImagePaintPartialRedraw) * PROJ_BOUNDBOX_SQUARED); projIma->undoRect = (volatile void **) BLI_memarena_alloc(arena, size); - memset(projIma->undoRect, 0, size); + memset((void *)projIma->undoRect, 0, size); projIma->maskRect = BLI_memarena_alloc(arena, size); memset(projIma->maskRect, 0, size); projIma->valid = BLI_memarena_alloc(arena, size); diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c index dbedfaa1de4..1ff656243d6 100644 --- a/source/blender/editors/space_clip/clip_editor.c +++ b/source/blender/editors/space_clip/clip_editor.c @@ -779,7 +779,7 @@ static unsigned char *prefetch_thread_next_frame( return mem; } -static void prefetch_task_func(TaskPool *pool, void *task_data, int UNUSED(threadid)) +static void prefetch_task_func(TaskPool * __restrict pool, void *task_data, int UNUSED(threadid)) { PrefetchQueue *queue = (PrefetchQueue *)BLI_task_pool_userdata(pool); MovieClip *clip = (MovieClip *)task_data; diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 7a66599655f..980657fc1cb 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1180,7 +1180,7 @@ static unsigned char *proxy_thread_next_frame(ProxyQueue *queue, MovieClip *clip return mem; } -static void proxy_task_func(TaskPool *pool, void *task_data, int UNUSED(threadid)) +static void proxy_task_func(TaskPool * __restrict pool, void *task_data, int UNUSED(threadid)) { ProxyThread *data = (ProxyThread *)task_data; ProxyQueue *queue = (ProxyQueue *)BLI_task_pool_userdata(pool); diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 85d92d07222..98eed5bdc7d 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1058,7 +1058,7 @@ static void filelist_intern_free(FileListIntern *filelist_intern) MEM_SAFE_FREE(filelist_intern->filtered); } -static void filelist_cache_preview_runf(TaskPool *pool, void *taskdata, int UNUSED(threadid)) +static void filelist_cache_preview_runf(TaskPool *__restrict pool, void *taskdata, int UNUSED(threadid)) { FileListEntryCache *cache = BLI_task_pool_userdata(pool); FileListEntryPreview *preview = taskdata; @@ -1094,7 +1094,7 @@ static void filelist_cache_preview_runf(TaskPool *pool, void *taskdata, int UNUS // printf("%s: End (%d)...\n", __func__, threadid); } -static void filelist_cache_preview_freef(TaskPool *UNUSED(pool), void *taskdata, int UNUSED(threadid)) +static void filelist_cache_preview_freef(TaskPool * __restrict UNUSED(pool), void *taskdata, int UNUSED(threadid)) { FileListEntryPreview *preview = taskdata; |