diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-25 10:58:40 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-25 10:58:40 +0300 |
commit | 43c4d0bf23c2dd8230f58a07b55d1234c1e81acf (patch) | |
tree | df9f31dbebf3c63556aa015bb7c196caea5de90e /source/blender/blenkernel/intern/multires_reshape.c | |
parent | a933293f11199e6f7e8c24232ff5214229980cfb (diff) |
Multires: Pass total level instead of modifier data
This is the only thing which needs to be done to perform propoer
reshape. Makes it easier to re-use code from other places.
Diffstat (limited to 'source/blender/blenkernel/intern/multires_reshape.c')
-rw-r--r-- | source/blender/blenkernel/intern/multires_reshape.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 20deb788194..bd0ea935b76 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -1069,7 +1069,7 @@ static void reshape_from_ccg_task( } bool multiresModifier_reshapeFromCCG( - MultiresModifierData *mmd, + const int tot_level, Mesh *coarse_mesh, SubdivCCG *subdiv_ccg) { @@ -1091,8 +1091,8 @@ bool multiresModifier_reshapeFromCCG( .mdisps = mdisps, .grid_paint_mask = grid_paint_mask, /* TODO(sergey): Use grid_size_for_level_get */ - .grid_size = (1 << (mmd->totlvl - 1)) + 1, - .level = mmd->totlvl}, + .grid_size = (1 << (tot_level - 1)) + 1, + .level = tot_level}, .face_ptex_offset = BKE_subdiv_face_ptex_offset_get(subdiv), .key = &key, .grids = subdiv_ccg->grids}; @@ -1101,7 +1101,7 @@ bool multiresModifier_reshapeFromCCG( /* Initialize propagation to higher levels. */ MultiresPropagateData propagate_data; multires_reshape_propagate_prepare( - &propagate_data, coarse_mesh, key.level, mmd->totlvl); + &propagate_data, coarse_mesh, key.level, tot_level); /* Threaded grids iteration. */ ParallelRangeSettings parallel_range_settings; BLI_parallel_range_settings_defaults(¶llel_range_settings); |