diff options
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index cc0e80c81e9..83e0d99bc6b 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1429,20 +1429,21 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos DerivedMesh *dm = NULL, *orcodm, *clothorcodm, *finaldm; int numVerts = me->totvert; int required_mode; - int isPrevDeform = FALSE; - int skipVirtualArmature = (useDeform < 0); + bool isPrevDeform = false; + const bool skipVirtualArmature = (useDeform < 0); MultiresModifierData *mmd = get_multires_modifier(scene, ob, 0); - int has_multires = mmd != NULL, multires_applied = 0; - int sculpt_mode = ob->mode & OB_MODE_SCULPT && ob->sculpt; - int sculpt_dyntopo = (sculpt_mode && ob->sculpt->bm); - int draw_flag = dm_drawflag_calc(scene->toolsettings); + const bool has_multires = (mmd && mmd->sculptlvl != 0); + bool multires_applied = false; + const bool sculpt_mode = ob->mode & OB_MODE_SCULPT && ob->sculpt; + const bool sculpt_dyntopo = (sculpt_mode && ob->sculpt->bm); + const int draw_flag = dm_drawflag_calc(scene->toolsettings); /* Generic preview only in object mode! */ - const int do_mod_mcol = (ob->mode == OB_MODE_OBJECT); + const bool do_mod_mcol = (ob->mode == OB_MODE_OBJECT); #if 0 /* XXX Will re-enable this when we have global mod stack options. */ - const int do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol; + const bool do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol; #endif - const int do_final_wmcol = FALSE; + const bool do_final_wmcol = FALSE; int do_init_wmcol = ((dataMask & CD_MASK_PREVIEW_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT) && !do_final_wmcol); /* XXX Same as above... For now, only weights preview in WPaint mode. */ const int do_mod_wmcol = do_init_wmcol; @@ -1456,9 +1457,6 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if (useDeform) deform_app_flags |= MOD_APPLY_USECACHE; - if (mmd && !mmd->sculptlvl) - has_multires = 0; - if (!skipVirtualArmature) { firstmd = modifiers_getVirtualModifierList(ob, &virtualModifierData); } @@ -1570,7 +1568,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if (sculpt_mode && (!has_multires || multires_applied || ob->sculpt->bm)) { - int unsupported = 0; + bool unsupported = false; if (md->type == eModifierType_Multires && ((MultiresModifierData *)md)->sculptlvl == 0) { /* If multires is on level 0 skip it silently without warning message. */ @@ -1578,10 +1576,10 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos } if (sculpt_dyntopo && !useRenderParams) - unsupported = TRUE; + unsupported = true; if (scene->toolsettings->sculpt->flags & SCULPT_ONLY_DEFORM) - unsupported |= mti->type != eModifierTypeType_OnlyDeform; + unsupported |= (mti->type != eModifierTypeType_OnlyDeform); unsupported |= multires_applied; @@ -1786,8 +1784,9 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos if ((index >= 0) && (BLI_findindex(&ob->modifiers, md) >= index)) break; - if (sculpt_mode && md->type == eModifierType_Multires) - multires_applied = 1; + if (sculpt_mode && md->type == eModifierType_Multires) { + multires_applied = true; + } } for (md = firstmd; md; md = md->next) @@ -1970,10 +1969,10 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D #if 0 /* XXX Will re-enable this when we have global mod stack options. */ const int do_final_wmcol = (scene->toolsettings->weights_preview == WP_WPREVIEW_FINAL) && do_wmcol; #endif - const int do_final_wmcol = FALSE; - int do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol); - int do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol); - const int do_mod_wmcol = do_init_wmcol; + const bool do_final_wmcol = FALSE; + const bool do_init_wmcol = ((((Mesh *)ob->data)->drawflag & ME_DRAWEIGHT) && !do_final_wmcol); + const bool do_init_statvis = ((((Mesh *)ob->data)->drawflag & ME_DRAW_STATVIS) && !do_init_wmcol); + const bool do_mod_wmcol = do_init_wmcol; VirtualModifierData virtualModifierData; modifiers_clearErrors(ob); |