Commit: 3b9e69cbdfb329e658bf7f0c892b024316aa4567
Author: Grigory Revzin
Date: Sun Jun 15 18:51:17 2014 +0400
https://developer.blender.org/rB3b9e69cbdfb329e658bf7f0c892b024316aa4567
Merge remote-tracking branch 'origin/master' into soc
Now I have a facny 2.71 splash too!
Conflicts:
source/blender/blenloader/intern/versioning_270.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 12db654,b812cf1..2522226
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -252,59 -251,51 +252,61 @@@ void blo_do_versions_270(FileData *fd,
}
}
- if (!DNA_struct_elem_find(fd->filesdna, "Key", "short", "mix_mode")) {
- Key *k;
+ if (!MAIN_VERSION_ATLEAST(main, 271, 0)) {
+ if (!DNA_struct_elem_find(fd->filesdna, "Material", "int",
"mode2")) {
+ Material *ma;
- /* set mixing to be governed by animdata */
- for (k = main->key.first; k; k = k->id.next) {
- k->mix_mode = KEY_MIX_FROM_ANIMDATA;
+ for (ma = main->mat.first; ma; ma = ma->id.next)
+ ma->mode2 = MA_CASTSHADOW;
}
- }
-
- if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
/* will be replaced with version check when other new flag is added to mode2 */
- Material *ma;
++ if (!DNA_struct_elem_find(fd->filesdna, "Key", "short",
"mix_mode")) {
++ Key *k;
+
- for (ma = main->mat.first; ma; ma = ma->id.next)
- ma->mode2 = MA_CASTSHADOW;
- }
++ /* set mixing to be governed by animdata */
++ for (k = main->key.first; k; k = k->id.next) {
++ k->mix_mode = KEY_MIX_FROM_ANIMDATA;
++ }
+
- if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData",
"bake")) {
- Scene *sce;
++ }
+
- for (sce = main->scene.first; sce; sce = sce->id.next) {
- sce->r.bake.flag = R_BAKE_CLEAR;
- sce->r.bake.width = 512;
- sce->r.bake.height = 512;
- sce->r.bake.margin = 16;
- sce->r.bake.normal_space = R_BAKE_SPACE_TANGENT;
- sce->r.bake.normal_swizzle[0] = R_BAKE_POSX;
- sce->r.bake.normal_swizzle[1] = R_BAKE_POSY;
- sce->r.bake.normal_swizzle[2] = R_BAKE_POSZ;
- BLI_strncpy(sce->r.bake.filepath, U.renderdir,
sizeof(sce->r.bake.filepath));
-
- sce->r.bake.im_format.planes = R_IMF_PLANES_RGBA;
- sce->r.bake.im_format.imtype = R_IMF_IMTYPE_PNG;
- sce->r.bake.im_format.depth = R_IMF_CHAN_DEPTH_8;
- sce->r.bake.im_format.quality = 90;
- sce->r.bake.im_format.compress = 15;
+ if (!DNA_struct_elem_find(fd->filesdna, "RenderData",
"BakeData", "bake")) {
+ Scene *sce;
+
+ for (sce = main->scene.first; sce; sce = sce->id.next) {
+ sce->r.bake.flag = R_BAKE_CLEAR;
+ sce->r.bake.width = 512;
+ sce->r.bake.height = 512;
+ sce->r.bake.margin = 16;
+ sce->r.bake.normal_space = R_BAKE_SPACE_TANGENT;
+ sce->r.bake.normal_swizzle[0] = R_BAKE_POSX;
+ sce->r.bake.normal_swizzle[1] = R_BAKE_POSY;
+ sce->r.bake.normal_swizzle[2] = R_BAKE_POSZ;
+ BLI_strncpy(sce->r.bake.filepath, U.renderdir,
sizeof(sce->r.bake.filepath));
+
+ sce->r.bake.im_format.planes =
R_IMF_PLANES_RGBA;
+ sce->r.bake.im_format.imtype = R_IMF_IMTYPE_PNG;
+ sce->r.bake.im_format.depth =
R_IMF_CHAN_DEPTH_8;
+ sce->r.bake.im_format.quality = 90;
+ sce->r.bake.im_format.compress = 15;
+ }
}
- }
- if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float",
"texstep")) {
- FreestyleLineStyle *linestyle;
+ if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle",
"float", "texstep")) {
+ FreestyleLineStyle *linestyle;
- for (linestyle = main->linestyle.first; linestyle; linestyle =
linestyle->id.next) {
- linestyle->flag |= LS_TEXTURE;
- linestyle->texstep = 1.0;
+ for (linestyle = main->linestyle.first; linestyle;
linestyle = linestyle->id.next) {
+ linestyle->flag |= LS_TEXTURE;
+ linestyle->texstep = 1.0;
+ }
}
- }
- {
- Scene *scene;
- for (scene = main->scene.first; scene; scene = scene->id.next) {
- int num_layers = BLI_countlist(&scene->r.layers);
- scene->r.actlay = min_ff(scene->r.actlay, num_layers -
1);
+ {
+ Scene *scene;
+ for (scene = main->scene.first; scene; scene =
scene->id.next) {
+ int num_layers =
BLI_countlist(&scene->r.layers);
+ scene->r.actlay = min_ff(scene->r.actlay,
num_layers - 1);
+ }
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
