[Bf-blender-cvs] [ddd95b9712] clay-engine: Fixed versionning
Clément Foucault
noreply at git.blender.org
Wed Jan 11 17:47:34 CET 2017
Commit: ddd95b971266649eb2d52dd0b6e4c30954b14abb
Author: Clément Foucault
Date: Wed Jan 11 17:38:00 2017 +0100
Branches: clay-engine
https://developer.blender.org/rBddd95b971266649eb2d52dd0b6e4c30954b14abb
Fixed versionning
===================================================================
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 22a0aa5613..264a2d0f46 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -145,16 +145,18 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
}
/* Clay engine defaults */
- for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
- EngineDataClay *settings = &scene->claydata;
-
- settings->matcap_rot = 0.0;
- settings->matcap_hue = 0.0;
- settings->ssao_distance = 0.2;
- settings->ssao_attenuation = 1.0f;
- settings->ssao_factor_cavity = 2.0f;
- settings->ssao_factor_edge = 2.0f;
- settings->ssao_samples = 32;
+ if (!DNA_struct_elem_find(fd->filesdna, "Scene", "EngineDataClay", "claydata")) {
+ for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ EngineDataClay *settings = &scene->claydata;
+
+ settings->matcap_rot = 0.0;
+ settings->matcap_hue = 0.0;
+ settings->ssao_distance = 0.2;
+ settings->ssao_attenuation = 1.0f;
+ settings->ssao_factor_cavity = 2.0f;
+ settings->ssao_factor_edge = 2.0f;
+ settings->ssao_samples = 32;
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list