[Bf-blender-cvs] [55aaa27] master: Cleanup, avoid passing const pointer to MEM_freeN()
Sergey Sharybin
noreply at git.blender.org
Sat Feb 20 14:07:21 CET 2016
Commit: 55aaa270189838dced79cc6e72f495e14810c460
Author: Sergey Sharybin
Date: Sat Feb 20 11:47:51 2016 +0500
Branches: master
https://developer.blender.org/rB55aaa270189838dced79cc6e72f495e14810c460
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.
===================================================================
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 00c8497..49b380f 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 c29840c..b869363 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);
More information about the Bf-blender-cvs
mailing list