[Bf-blender-cvs] [5c671d6] bake-cycles: Cycles-Bake: conflict fix from merge

Dalai Felinto noreply at git.blender.org
Wed Apr 23 02:48:08 CEST 2014


Commit: 5c671d67c774a634dabba738e0bd0fc8b8511984
Author: Dalai Felinto
Date:   Mon Apr 14 14:47:52 2014 -0300
https://developer.blender.org/rB5c671d67c774a634dabba738e0bd0fc8b8511984

Cycles-Bake: conflict fix from merge

===================================================================

M	source/blender/blenloader/intern/versioning_270.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 685a1d4..99c0975 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -79,28 +79,6 @@ static void do_version_constraints_radians_degrees_270_1(ListBase *lb)
 			}
 		}
 	}
-
-	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_SAVE_EXTERNAL;
-			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;
-		}
-	}
 }
 
 
@@ -204,4 +182,26 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			linestyle->integration_type = LS_INTEGRATION_MEAN;
 		}
 	}
+
+	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_SAVE_EXTERNAL;
+			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;
+		}
+	}
 }




More information about the Bf-blender-cvs mailing list