Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenSubdiv: Fix missing object ORCO when Subsurf uses OpenSubdiv but disabled fore viewport

Browse Source
This commit is contained in:
Sergey Sharybin
2016-09-01 15:27:08 +02:00
parent f7263b8b1a
commit 9e39488fa6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -2565,11 +2565,15 @@ static void editbmesh_calc_modifiers(
* we'll be using GPU backend of OpenSubdiv. This is so * we'll be using GPU backend of OpenSubdiv. This is so
* playback performance is kept as high as possible. * playback performance is kept as high as possible.
*/ */
static bool calc_modifiers_skip_orco(const Object *ob) static bool calc_modifiers_skip_orco(Scene *scene,
const Object *ob,
bool use_render_params)
{ {
const ModifierData *last_md = ob->modifiers.last; ModifierData *last_md = ob->modifiers.last;
const int required_mode = use_render_params ? eModifierMode_Render : eModifierMode_Realtime;
if (last_md != NULL && if (last_md != NULL &&
last_md->type == eModifierType_Subsurf) last_md->type == eModifierType_Subsurf &&
modifier_isEnabled(scene, last_md, required_mode))
{ {
SubsurfModifierData *smd = (SubsurfModifierData *)last_md; SubsurfModifierData *smd = (SubsurfModifierData *)last_md;
/* TODO(sergey): Deduplicate this with checks from subsurf_ccg.c. */ /* TODO(sergey): Deduplicate this with checks from subsurf_ccg.c. */
@@ -2589,7 +2593,7 @@ static void mesh_build_data(
BKE_object_sculpt_modifiers_changed(ob); BKE_object_sculpt_modifiers_changed(ob);
#ifdef WITH_OPENSUBDIV #ifdef WITH_OPENSUBDIV
if (calc_modifiers_skip_orco(ob)) { if (calc_modifiers_skip_orco(scene, ob, false)) {
dataMask &= ~(CD_MASK_ORCO | CD_MASK_PREVIEW_MCOL); dataMask &= ~(CD_MASK_ORCO | CD_MASK_PREVIEW_MCOL);
} }
#endif #endif
@@ -2624,7 +2628,7 @@ static void editbmesh_build_data(Scene *scene, Object *obedit, BMEditMesh *em, C
BKE_editmesh_free_derivedmesh(em); BKE_editmesh_free_derivedmesh(em);
#ifdef WITH_OPENSUBDIV #ifdef WITH_OPENSUBDIV
if (calc_modifiers_skip_orco(obedit)) { if (calc_modifiers_skip_orco(scene, obedit, false)) {
dataMask &= ~(CD_MASK_ORCO | CD_MASK_PREVIEW_MCOL); dataMask &= ~(CD_MASK_ORCO | CD_MASK_PREVIEW_MCOL);
} }
#endif #endif