diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-11 18:27:59 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-11 18:27:59 +0300 |
| commit | 1e1c10e62786529886fad6bbbd30099be59f4a8d (patch) | |
| tree | 87c16565e82a70c3c3e6d842140412cd1892ddd2 /release/scripts/startup/bl_ui | |
| parent | 4bd1c1313ec2d08b843bb9e29c8668a781249548 (diff) | |
| parent | 3b5eac548fe13e2a93ae6a8dedd4c632edf950a0 (diff) | |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Diffstat (limited to 'release/scripts/startup/bl_ui')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 7 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 23b5e5779f9..a48e06249fb 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -174,14 +174,13 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel): if user or pin_id: layout.separator() - split = layout.split(percentage=0.65) - col = split.column() + row = layout.row() if pin_id: - col.template_ID(space, "pin_id") + row.template_ID(space, "pin_id") else: propname = context.texture_user_property.identifier - col.template_ID(user, propname, new="texture.new") + row.template_ID(user, propname, new="texture.new") if tex: split = layout.split(percentage=0.2) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 7af8be108c1..c0baeafe5fc 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1722,10 +1722,8 @@ class VIEW3D_PT_tools_projectpaint(View3DPaintPanel, Panel): sub.prop(ipaint, "normal_angle", text="") layout.prop(ipaint, "use_cavity") - sub = layout.column() - sub.active = (ipaint.use_cavity) - sub.prop(ipaint, "cavity_mul", slider=True) - sub.prop(ipaint, "invert_cavity") + if ipaint.use_cavity: + layout.template_curve_mapping(ipaint, "cavity_curve", brush=True) layout.prop(ipaint, "seam_bleed") layout.prop(ipaint, "dither") |