Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-28 15:54:27 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-28 15:55:21 +0300
commitb024ccd61992e33c62485a80c903a0f284d42dc5 (patch)
tree8f27687cdced8b217ca97ddc99b50c18a1ceecfb /source/blender/blenkernel/intern/scene.c
parentc53b1e2a93e17eb353d0dfa1472d501fd023d05f (diff)
Fix T45929: OpenSubdiv was doing extra object recalc tags
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index cccdbff4c9a..f114856e175 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1587,7 +1587,9 @@ static void scene_free_unused_opensubdiv_cache(Scene *scene)
if (md != NULL && md->type == eModifierType_Subsurf) {
SubsurfModifierData *smd = (SubsurfModifierData *) md;
bool object_in_editmode = object->mode == OB_MODE_EDIT;
- if (!smd->use_opensubdiv) {
+ if (!smd->use_opensubdiv ||
+ DAG_get_eval_flags_for_object(scene, object) & DAG_EVAL_NEED_CPU)
+ {
if (smd->mCache != NULL) {
ccgSubSurf_free_osd_mesh(smd->mCache);
}