From e422e56db05813940c4e6f053634c95f3e9d50b9 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 23 Sep 2014 22:56:37 +0600 Subject: Move versioning code under the subversion check --- intern/cycles/blender/addon/version_update.py | 17 +++++++++-------- source/blender/blenloader/intern/versioning_270.c | 16 +++++++++------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index 6c592f89a76..a8d800fadb5 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/intern/cycles/blender/addon/version_update.py @@ -48,11 +48,12 @@ def do_versions(self): cscene.volume_bounces = 1 # Caustics Reflective/Refractive separation in 272 - for scene in bpy.data.scenes: - cscene = scene.cycles - if (cscene.get("no_caustics", False) and - not cscene.is_property_set("caustics_reflective") and - not cscene.is_property_set("caustics_refractive")): - - cscene.caustics_reflective = False - cscene.caustics_refractive = False + if bpy.data.version <= (2, 71, 0): + for scene in bpy.data.scenes: + cscene = scene.cycles + if (cscene.get("no_caustics", False) and + not cscene.is_property_set("caustics_reflective") and + not cscene.is_property_set("caustics_refractive")): + + cscene.caustics_reflective = False + cscene.caustics_refractive = False diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 8e760a9c9f6..67d51ab0493 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -352,13 +352,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } - if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) { - Scene *scene; - for (scene = main->scene.first; scene; scene = scene->id.next) { - scene->r.preview_start_resolution = 64; - } - } - if (!MAIN_VERSION_ATLEAST(main, 271, 6)) { Object *ob; for (ob = main->object.first; ob; ob = ob->id.next) { @@ -374,4 +367,13 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } } + + if (!MAIN_VERSION_ATLEAST(main, 272, 0)) { + if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) { + Scene *scene; + for (scene = main->scene.first; scene; scene = scene->id.next) { + scene->r.preview_start_resolution = 64; + } + } + } } -- cgit v1.2.3