Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 51853.

Browse Source 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c

This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!
This commit is contained in:
Tamito Kajiyama
2012-11-04 02:22:56 +00:00
parent 6dfa160109 2f2c0a51a5
commit dd8e836067
401 changed files with 5843 additions and 3351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
release/scripts/startup/bl_ui/properties_render.py
View File

@@ -228,11 +228,13 @@ class RENDER_PT_performance(RenderButtonsPanel, Panel):
split = layout.split()
col = split.column()
col.label(text="Threads:")
col.row().prop(rd, "threads_mode", expand=True)
sub = col.column()
sub.enabled = rd.threads_mode == 'FIXED'
sub.prop(rd, "threads")
sub = col.column(align=True)
sub.label(text="Threads:")
sub.row().prop(rd, "threads_mode", expand=True)
subsub = sub.column()
subsub.enabled = rd.threads_mode == 'FIXED'
subsub.prop(rd, "threads")
sub = col.column(align=True)
sub.label(text="Tiles:")
sub.prop(rd, "parts_x", text="X")