diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-28 17:05:04 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-28 22:02:59 +0300 |
commit | a016ad2ea8d718a8f48be841fe463bc5a54e3be8 (patch) | |
tree | b12021f9504358563f85e2eee279a27eeb1e56a6 /source/blender/modifiers/intern | |
parent | 06805251478c53a262bc1fe9a7224d1f1b5bf449 (diff) |
Fix part of T60735: invalid CD_ORIGINDEX data in some modifier stack evaluations.
BKE_mesh_new_nomain automatically added a CD_ORIGINDEX layer initialized to 0,
which was never filled in correctly. In 2.7 the equivalent function used to
modify the source derivedmesh and add valid original indices to it, but this
is no longer possible in the new design and was quite unpredictable anyway.
Now instead rely on mesh_calc_modifiers and the depsgraph to determine when
CD_ORIGINDEX should be added.
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index b14e6d64ab0..5e2183030db 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -176,7 +176,6 @@ typedef struct GenerateOceanGeometryData { MVert *mverts; MPoly *mpolys; MLoop *mloops; - int *origindex; MLoopUV *mloopuvs; int res_x, res_y; @@ -230,9 +229,6 @@ static void generate_ocean_geometry_polygons( mp->totloop = 4; mp->flag |= ME_SMOOTH; - - /* generated geometry does not map to original faces */ - gogd->origindex[fi] = ORIGINDEX_NONE; } } @@ -299,8 +295,6 @@ static Mesh *generate_ocean_geometry(OceanModifierData *omd) gogd.mpolys = result->mpoly; gogd.mloops = result->mloop; - gogd.origindex = CustomData_get_layer(&result->pdata, CD_ORIGINDEX); - ParallelRangeSettings settings; BLI_parallel_range_settings_defaults(&settings); settings.use_threading = use_threading; |