[Bf-blender-cvs] [139a4b6a844] master: Fix: Build error due to previous commit
Hans Goudey
noreply at git.blender.org
Sat May 14 19:46:59 CEST 2022
Commit: 139a4b6a844f6c6ae4c5bbd3c7799c91def7de35
Author: Hans Goudey
Date: Sat May 14 19:46:56 2022 +0200
Branches: master
https://developer.blender.org/rB139a4b6a844f6c6ae4c5bbd3c7799c91def7de35
Fix: Build error due to previous commit
===================================================================
M source/blender/blenkernel/intern/mesh_mirror.c
M source/blender/io/alembic/intern/abc_customdata.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c
index 6c9d49d42e0..715a1c9daf9 100644
--- a/source/blender/blenkernel/intern/mesh_mirror.c
+++ b/source/blender/blenkernel/intern/mesh_mirror.c
@@ -297,7 +297,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
/* handle shape keys */
totshape = CustomData_number_of_layers(&result->vdata, CD_SHAPEKEY);
for (a = 0; a < totshape; a++) {
- const float(*cos)[3] = CustomData_get_layer_n(&result->vdata, CD_SHAPEKEY, a);
+ float(*cos)[3] = CustomData_get_layer_n(&result->vdata, CD_SHAPEKEY, a);
for (i = maxVerts; i < result->totvert; i++) {
mul_m4_v3(mtx, cos[i]);
}
diff --git a/source/blender/io/alembic/intern/abc_customdata.cc b/source/blender/io/alembic/intern/abc_customdata.cc
index 0239b9e84b0..633611cf1a6 100644
--- a/source/blender/io/alembic/intern/abc_customdata.cc
+++ b/source/blender/io/alembic/intern/abc_customdata.cc
@@ -139,7 +139,7 @@ const char *get_uv_sample(UVSample &sample, const CDStreamConfig &config, Custom
*/
static void write_uv(const OCompoundProperty &prop,
CDStreamConfig &config,
- void *data,
+ const void *data,
const char *name)
{
std::vector<uint32_t> indices;
@@ -169,12 +169,12 @@ static void write_uv(const OCompoundProperty &prop,
static void get_cols(const CDStreamConfig &config,
std::vector<Imath::C4f> &buffer,
std::vector<uint32_t> &uvidx,
- void *cd_data)
+ const void *cd_data)
{
const float cscale = 1.0f / 255.0f;
- MPoly *polys = config.mpoly;
- MLoop *mloops = config.mloop;
- MCol *cfaces = static_cast<MCol *>(cd_data);
+ const MPoly *polys = config.mpoly;
+ const MLoop *mloops = config.mloop;
+ const MCol *cfaces = static_cast<const MCol *>(cd_data);
buffer.reserve(config.totvert);
uvidx.reserve(config.totvert);
@@ -182,9 +182,9 @@ static void get_cols(const CDStreamConfig &config,
Imath::C4f col;
for (int i = 0; i < config.totpoly; i++) {
- MPoly *p = &polys[i];
- MCol *cface = &cfaces[p->loopstart + p->totloop];
- MLoop *mloop = &mloops[p->loopstart + p->totloop];
+ const MPoly *p = &polys[i];
+ const MCol *cface = &cfaces[p->loopstart + p->totloop];
+ const MLoop *mloop = &mloops[p->loopstart + p->totloop];
for (int j = 0; j < p->totloop; j++) {
cface--;
@@ -207,7 +207,7 @@ static void get_cols(const CDStreamConfig &config,
*/
static void write_mcol(const OCompoundProperty &prop,
CDStreamConfig &config,
- void *data,
+ const void *data,
const char *name)
{
std::vector<uint32_t> indices;
More information about the Bf-blender-cvs
mailing list