blender
/
blender
127
395
Fork 565
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T57566: Blender 2.8 crashes with the new multires

This commit is contained in:
Sergey Sharybin 2018-11-16 10:34:00 +01:00
parent c1f5ccb11a
commit 50ba4762f6
Notes: blender-bot 2023-02-14 07:39:44 +01:00 
Referenced by issue #57566, Blender 2.8 crashes with the new multires. WITH_OPENSUBDIV_MODIFIER ON
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/multires_reshape.c
View File

@ -875,8 +875,6 @@ static bool multires_reshape_from_vertcos(
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Mesh *coarse_mesh = object->data;
MDisps *mdisps = CustomData_get_layer(&coarse_mesh->ldata, CD_MDISPS);
/* Make sure displacement grids are ready. */
multires_reshape_ensure_grids(coarse_mesh, mmd->totlvl);
/* Pick maximum between multires level and dispalcement level.
* This is because mesh can be used by objects with multires at different
* levels.
@ -885,6 +883,8 @@ static bool multires_reshape_from_vertcos(
* mdisps->level.
*/
const int top_level = max_ii(mmd->totlvl, mdisps->level);
/* Make sure displacement grids are ready. */
multires_reshape_ensure_grids(coarse_mesh, top_level);
/* Construct context. */
MultiresReshapeFromDeformedVertsContext reshape_deformed_verts_ctx = {
.reshape_ctx = {
@ -1166,8 +1166,6 @@ bool multiresModifier_reshapeFromCCG(
GridPaintMask *grid_paint_mask =
CustomData_get_layer(&coarse_mesh->ldata, CD_GRID_PAINT_MASK);
Subdiv *subdiv = subdiv_ccg->subdiv;
/* Make sure displacement grids are ready. */
multires_reshape_ensure_grids(coarse_mesh, tot_level);
/* Pick maximum between multires level and dispalcement level.
* This is because mesh can be used by objects with multires at different
* levels.
@ -1176,6 +1174,8 @@ bool multiresModifier_reshapeFromCCG(
* mdisps->level.
*/
const int top_level = max_ii(tot_level, mdisps->level);
/* Make sure displacement grids are ready. */
multires_reshape_ensure_grids(coarse_mesh, top_level);
/* Construct context. */
ReshapeFromCCGTaskData data = {
.reshape_ctx = {