[Bf-blender-cvs] [c7ba357] bake-cycles: Cycles-Bake: Internal save mode should be the default (since external is not even in the ui)
Dalai Felinto
noreply at git.blender.org
Sun Apr 27 18:04:32 CEST 2014
Commit: c7ba35706437053af474bc1ee0a903de57befb85
Author: Dalai Felinto
Date: Sun Apr 27 13:04:15 2014 -0300
https://developer.blender.org/rBc7ba35706437053af474bc1ee0a903de57befb85
Cycles-Bake: Internal save mode should be the default (since external is not even in the ui)
===================================================================
M source/blender/editors/object/object_bake_api.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 63682d1..ded001d 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -921,7 +921,7 @@ void OBJECT_OT_bake(wmOperatorType *ot)
RNA_def_enum(ot->srna, "normal_r", normal_swizzle_items, R_BAKE_POSX, "R", "Axis to bake in red channel");
RNA_def_enum(ot->srna, "normal_g", normal_swizzle_items, R_BAKE_POSY, "G", "Axis to bake in green channel");
RNA_def_enum(ot->srna, "normal_b", normal_swizzle_items, R_BAKE_POSZ, "B", "Axis to bake in blue channel");
- RNA_def_enum(ot->srna, "save_mode", bake_save_mode_items, R_BAKE_SAVE_EXTERNAL, "Save Mode",
+ RNA_def_enum(ot->srna, "save_mode", bake_save_mode_items, R_BAKE_SAVE_INTERNAL, "Save Mode",
"Choose how to save the baking map");
RNA_def_boolean(ot->srna, "use_clear", false, "Clear",
"Clear Images before baking (only for internal saving)");
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index d2454bf..3809447 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -392,8 +392,8 @@ typedef enum BakeNormalSwizzle {
/* (char) save_mode */
typedef enum BakeSaveMode {
- R_BAKE_SAVE_EXTERNAL = 0,
- R_BAKE_SAVE_INTERNAL = 1,
+ R_BAKE_SAVE_INTERNAL = 0,
+ R_BAKE_SAVE_EXTERNAL = 1,
} BakeSaveMode;
/* *************************************************************** */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 0848964..187c439 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -323,8 +323,8 @@ EnumPropertyItem normal_swizzle_items[] = {
};
EnumPropertyItem bake_save_mode_items[] = {
- {R_BAKE_SAVE_EXTERNAL, "EXTERNAL", 0, "External", "Save the baking map in an external file"},
{R_BAKE_SAVE_INTERNAL, "INTERNAL", 0, "Internal", "Save the baking map in an internal image datablock"},
+ {R_BAKE_SAVE_EXTERNAL, "EXTERNAL", 0, "External", "Save the baking map in an external file"},
{0, NULL, 0, NULL, NULL}
};
More information about the Bf-blender-cvs
mailing list