diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-23 04:23:11 +0400 |
| commit | 40449b1994301081f96d014df626a5375e020c76 (patch) | |
| tree | 20220d8b071310fda8a0ab851c7a8f7bcc3ed8a2 /release/scripts/startup/bl_ui/properties_render.py | |
| parent | fa0211df269a3398dd70467982f9e129c79e501b (diff) | |
| parent | 3ca00cbf541d0283e91dc454866a5f24576271be (diff) | |
Merged changes in the trunk up to revision 53280.
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 519aae96e91..4d14f25c9e8 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -1,4 +1,5 @@ # ##### BEGIN GPL LICENSE BLOCK ##### + # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -544,7 +545,7 @@ class RENDER_PT_bake(RenderButtonsPanel, Panel): if rd.bake_type == 'AO': col = split.column() col.prop(rd, "bake_bias") - col.prop(rd, "bake_rays_number") + col.prop(rd, "bake_samples") if __name__ == "__main__": # only for live edit. |