Cycles-Bake: internal saving and split image per material

We can now export more than one image (if there is more than one
material in the object), as well as automatically name the texture based
on the pass type.

This was a big refactor of the operator code, but things should be
stable now. use_automatic_name should probably be named use_prefix or
something.

Not working:
* use_clear (in fact it's always clearing, I need to copy only a few parts of the image, using a mask)
* image update - right now you need to click in the Image Editor to
  see/refresh the baked image

1 files changed, 18 insertions, 7 deletions

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 59136d5401a..d2454bfa27a 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -361,22 +361,26 @@ typedef struct ImageFormatData {
 #define R_IMF_CINEON_FLAG_LOG (1<<0)  /* was R_CINEON_LOG */
 
 typedef struct BakeData {
-
 	struct ImageFormatData im_format;
+
 	char filepath[1024]; /* FILE_MAX */
 
 	short width, height;
 	short margin, flag;
 
-	short normal_swizzle[3];
-	short normal_space;
-
 	float cage_extrusion;
-	float pad;
+	float pad2;
+
+	char normal_swizzle[3];
+	char normal_space;
+
+	char save_mode;
+	char pad[3];
+
 	char cage[64];  /* MAX_NAME */
 } BakeData;
 
-/* (short) normal_swizzle */
+/* (char) normal_swizzle */
 typedef enum BakeNormalSwizzle {
 	R_BAKE_POSX = 0,
 	R_BAKE_POSY = 1,
@@ -386,6 +390,12 @@ typedef enum BakeNormalSwizzle {
 	R_BAKE_NEGZ = 5,
 } BakeNormalSwizzle;
 
+/* (char) save_mode */
+typedef enum BakeSaveMode {
+	R_BAKE_SAVE_EXTERNAL = 0,
+	R_BAKE_SAVE_INTERNAL = 1,
+} BakeSaveMode;
+
 /* *************************************************************** */
 /* Render Data */
 
@@ -1434,7 +1444,8 @@ enum {
 #define R_BAKE_LORES_MESH	32
 #define R_BAKE_VCOL			64
 #define R_BAKE_USERSCALE	128
-#define R_BAKE_SAVE_EXTERNAL	256
+#define R_BAKE_SPLIT_MAT	256
+#define R_BAKE_AUTO_NAME	512
 
 /* bake_normal_space */
 #define R_BAKE_SPACE_CAMERA	 0