diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-08-31 18:33:23 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-08-31 18:33:23 +0300 |
| commit | f987d9b7583c1ce45c6c19eec054d023e12a0f57 (patch) | |
| tree | 96d0397d430dbfaae539f830982d0bf0dc7876af /source/blender/blenkernel/intern | |
| parent | 2a13ce1e61d8881d445293a132d087eb8c14bdc3 (diff) | |
| parent | a6ba8e5f38dbf62392088c3020aab549b7c80554 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.cc | 16 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_validate.cc | 7 |
2 files changed, 3 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index 51edf8308c3..9a9128387b1 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -1008,11 +1008,6 @@ static void layerInterp_mloopcol(const void **sources, mc->a = round_fl_to_uchar_clamp(col.a); } -static int layerMaxNum_mloopcol() -{ - return MAX_MCOL; -} - /** \} */ /* -------------------------------------------------------------------- */ @@ -1517,11 +1512,6 @@ static void layerInterp_propcol(const void **sources, copy_v4_v4(mc->color, col); } -static int layerMaxNum_propcol() -{ - return MAX_MCOL; -} - /** \} */ /* -------------------------------------------------------------------- */ @@ -1697,7 +1687,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, layerMaxNum_mloopcol}, + nullptr, nullptr, nullptr}, /* 7: CD_ORIGINDEX */ {sizeof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, layerDefault_origindex}, /* 8: CD_NORMAL */ @@ -1810,7 +1800,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { nullptr, nullptr, nullptr, - layerMaxNum_mloopcol}, + nullptr}, /* 18: CD_TANGENT */ {sizeof(float[4][4]), "", 0, N_("Tangent"), nullptr, nullptr, nullptr, nullptr, nullptr}, /* 19: CD_MDISPS */ @@ -2008,7 +1998,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = { nullptr, nullptr, nullptr, - layerMaxNum_propcol}, + nullptr}, /* 48: CD_PROP_FLOAT3 */ {sizeof(float[3]), "vec3f", diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc index 3d8bbe3d6f8..bc56120ca57 100644 --- a/source/blender/blenkernel/intern/mesh_validate.cc +++ b/source/blender/blenkernel/intern/mesh_validate.cc @@ -1029,13 +1029,6 @@ bool BKE_mesh_validate_all_customdata(CustomData *vdata, MAX_MTFACE, tot_uvloop - MAX_MTFACE); } - if (tot_vcolloop > MAX_MCOL) { - PRINT_ERR( - "\tMore VCol layers than %d allowed, %d last ones won't be available for render, shaders, " - "etc.\n", - MAX_MCOL, - tot_vcolloop - MAX_MCOL); - } /* check indices of clone/stencil */ if (do_fixes && CustomData_get_clone_layer(ldata, CD_MLOOPUV) >= tot_uvloop) { |