diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 09:47:51 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 12:06:07 +0300 |
commit | 55aaa270189838dced79cc6e72f495e14810c460 (patch) | |
tree | 499f9bc6c754ef34dd888dbdfb3f2ead6eb90f70 | |
parent | 637f97b316570aafb3cfd328f48b4c1ab70edc87 (diff) |
Cleanup, avoid passing const pointer to MEM_freeN()
This generates warnings with MSVC. Similar typecast was
already done in other cases, so think it's all fine.
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 00c84976516..49b380f9a9b 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1500,7 +1500,7 @@ static void cdDM_buffer_copy_uv_texpaint( } } - MEM_freeN(uv_base); + MEM_freeN((void*)uv_base); } /* treat varray_ as an array of MCol, four MCol's per face */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index c29840cc654..b8693639673 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -3934,10 +3934,10 @@ static void project_paint_end(ProjPaintState *ps) /* must be set for non-shared */ BLI_assert(ps->dm_mloopuv || ps->is_shared_user); if (ps->dm_mloopuv) - MEM_freeN(ps->dm_mloopuv); + MEM_freeN((void *)ps->dm_mloopuv); if (ps->do_layer_clone) - MEM_freeN(ps->dm_mloopuv_clone); + MEM_freeN((void *)ps->dm_mloopuv_clone); if (ps->thread_tot > 1) { BLI_spin_end(ps->tile_lock); MEM_freeN((void *)ps->tile_lock); |