Commit: 40efa4b6a050c30181c6e173e5497a67124c2f01
Author: Dalai Felinto
Date: Fri Apr 25 16:16:49 2014 -0300
https://developer.blender.org/rB40efa4b6a050c30181c6e173e5497a67124c2f01
Cycles-Bake: UI changes: removing External Saving options
Campbell and I discussed and we decided to deliver only the basic feature-set
before moving into new additions.
That doesn't mean cage will be removed, but let's reevaluate the need for
saving externally after bake-cycles 1.0 gets in master.
If you saved a file with the branch you should do this in the python console:
bpy.context.scene.render.bake.save_mode = 'INTERNAL'
===================================================================
M intern/cycles/blender/addon/ui.py
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/intern/cycles/blender/addon/ui.py
b/intern/cycles/blender/addon/ui.py
index c96636a..aae0d63 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1247,21 +1247,18 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel):
col.prop(cscene, "bake_type")
col.separator()
- row = col.row()
-
- sub = row.column(align=True)
- sub.active = cbk.save_mode == 'EXTERNAL'
- sub.prop(cbk, "width")
- sub.prop(cbk, "height")
+ split = layout.split()
- sub = row.column()
+ sub = split.column()
+ sub.prop(cbk, "use_clear")
sub.prop(cbk, "margin")
- col.separator()
- col.prop(cbk, "use_selected_to_active")
- sub = col.column()
+ sub = split.column()
+ sub.prop(cbk, "use_selected_to_active")
+ sub = sub.column()
+
sub.active = cbk.use_selected_to_active
- sub.prop(cbk, "cage_extrusion")
+ sub.prop(cbk, "cage_extrusion", text="Distance")
sub.prop_search(cbk, "cage", scene, "objects")
if cscene.bake_type == 'NORMAL':
@@ -1276,23 +1273,6 @@ class CyclesRender_PT_bake(CyclesButtonsPanel, Panel):
row.prop(cbk, "normal_g", text="")
row.prop(cbk, "normal_b", text="")
- col.separator()
- col.label(text="Output:")
- col.row().prop(cbk, "save_mode", expand=True)
-
- if cbk.save_mode == 'EXTERNAL':
- row = col.row()
- row.prop(cbk, "use_automatic_name")
- row.prop(cbk, "use_split_materials")
-
- col.separator()
- col.prop(cbk, "filepath", text="")
-
- col.separator()
- col.template_image_settings(cbk.image_settings,
color_management=False)
- else:
- col.prop(cbk, "use_clear")
-
class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel):
bl_label = "Cycles Hair Settings"
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 83a6a49..5b0f379 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -477,7 +477,7 @@ Scene *BKE_scene_add(Main *bmain, const char *name)
sce->r.bake_samples = 256;
sce->r.bake_biasdist = 0.001;
- sce->r.bake.flag = R_BAKE_SAVE_EXTERNAL;
+ sce->r.bake.flag = R_BAKE_CLEAR;
sce->r.bake.width = 512;
sce->r.bake.height = 512;
sce->r.bake.margin = 16;
diff --git a/source/blender/blenloader/intern/versioning_270.c
b/source/blender/blenloader/intern/versioning_270.c
index 050f41b..94a8386 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -218,7 +218,7 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *main)
Scene *sce;
for (sce = main->scene.first; sce; sce = sce->id.next) {
- sce->r.bake.flag = R_BAKE_SAVE_EXTERNAL;
+ sce->r.bake.flag = R_BAKE_CLEAR;
sce->r.bake.width = 512;
sce->r.bake.height = 512;
sce->r.bake.margin = 16;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
