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-05 15:15:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-05 15:15:46 +0300
commit0ea45676d026b2d8c43809f2dc5394c73298ee3f (patch)
treeec143188a5afb00a49726036347f28e6ecea8523 /source/blender/blenkernel/intern/scene.c
parenta474409f0bf04fb2b87d7a914ea3f18d97623cdc (diff)
OpenSubdiv: Fix crash happening when disabling Use OpenSubdiv option
The issue was caused by the changes from this morning.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 19c2ff10901..e2687246820 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1573,6 +1573,14 @@ 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->mCache != NULL) {
+ ccgSubSurf_free_osd_mesh(smd->mCache);
+ }
+ if (smd->emCache != NULL) {
+ ccgSubSurf_free_osd_mesh(smd->emCache);
+ }
+ }
if (object_in_editmode && smd->mCache != NULL) {
ccgSubSurf_free(smd->mCache);
smd->mCache = NULL;