diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-08-31 21:32:33 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-08-31 21:32:33 +0300 |
| commit | 44f8056fdf69ee499b22f36e30c0533339eb4c4c (patch) | |
| tree | 7339c4872ddc51c757f6b23773c64a79246657d0 /source/blender/modifiers/intern | |
| parent | 54b650bc297cce00a44da527f7e63e07c4d7e21f (diff) | |
Cleanup, fixes
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.cc | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 26 |
2 files changed, 15 insertions, 14 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index 918689ff36e..605fe40f7d1 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -186,7 +186,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * const Span<MPoly> me_polygons = blender::bke::mesh_polygons(*me); /* TODO(sybren+bastien): possibly check relevant custom data layers (UV/color depending on - * flags) and duplicate those too. */ + * flags) and duplicate those too. + * XXX(Hans): This probably isn't true anymore with various CoW improvements, etc. */ if ((me_vertices.data() == mesh_verts.data()) || (me_edges.data() == mesh_edges.data()) || (me_polygons.data() == mesh_polys.data())) { /* We need to duplicate data here, otherwise we'll modify org mesh, see T51701. */ diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 51e0d869af1..cca49b42208 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -372,11 +372,11 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes /* add vcols before displacement - allows lookup based on position */ if (omd->flag & MOD_OCEAN_GENERATE_FOAM) { - const int polys_num = result->totpoly; - const int loops_num = result->totloop; - MLoop *mloops = BKE_mesh_loops_for_write(result); - MLoopCol *mloopcols = CustomData_add_layer_named( - &result->ldata, CD_PROP_BYTE_COLOR, CD_CALLOC, NULL, loops_num, omd->foamlayername); + const int polys_num = result->totpoly; + const int loops_num = result->totloop; + MLoop *mloops = BKE_mesh_loops_for_write(result); + MLoopCol *mloopcols = CustomData_add_layer_named( + &result->ldata, CD_PROP_BYTE_COLOR, CD_SET_DEFAULT, NULL, loops_num, omd->foamlayername); MLoopCol *mloopcols_spray = NULL; if (omd->flag & MOD_OCEAN_GENERATE_SPRAY) { @@ -388,12 +388,12 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes omd->spraylayername); } - if (mloopcols) { /* unlikely to fail */ - MPoly *mp; + if (mloopcols) { /* unlikely to fail */ + MPoly *mp; - for (i = 0, mp = polys; i < polys_num; i++, mp++) { - MLoop *ml = &mloops[mp->loopstart]; - MLoopCol *mlcol = &mloopcols[mp->loopstart]; + for (i = 0, mp = polys; i < polys_num; i++, mp++) { + MLoop *ml = &mloops[mp->loopstart]; + MLoopCol *mlcol = &mloopcols[mp->loopstart]; MLoopCol *mlcolspray = NULL; if (omd->flag & MOD_OCEAN_GENERATE_SPRAY) { @@ -416,9 +416,9 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes foam = BKE_ocean_jminus_to_foam(ocr.Jminus, omd->foam_coverage); } - mlcol->r = mlcol->g = mlcol->b = (char)(foam * 255); - /* This needs to be set (render engine uses) */ - mlcol->a = 255; + mlcol->r = mlcol->g = mlcol->b = (char)(foam * 255); + /* This needs to be set (render engine uses) */ + mlcol->a = 255; if (omd->flag & MOD_OCEAN_GENERATE_SPRAY) { if (omd->flag & MOD_OCEAN_INVERT_SPRAY) { |