[Bf-blender-cvs] [e422e56] master: Move versioning code under the subversion check
Sergey Sharybin
noreply at git.blender.org
Tue Sep 23 18:57:04 CEST 2014
Commit: e422e56db05813940c4e6f053634c95f3e9d50b9
Author: Sergey Sharybin
Date: Tue Sep 23 22:56:37 2014 +0600
Branches: master
https://developer.blender.org/rBe422e56db05813940c4e6f053634c95f3e9d50b9
Move versioning code under the subversion check
===================================================================
M intern/cycles/blender/addon/version_update.py
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 6c592f8..a8d800f 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 8e760a9..67d51ab 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;
+ }
+ }
+ }
}
More information about the Bf-blender-cvs
mailing list