diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-11 00:38:30 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-11 00:38:30 +0300 |
| commit | b851063d24acca6bf94484218fe8df037fe07af7 (patch) | |
| tree | 0f72dcc686645363b424ceb10758abae33dfedea /release/scripts/startup | |
| parent | f1e1dbdc03e45aba062857d7892f18ae6231230f (diff) | |
| parent | 4b04a4e2ff4b00258dd98d4d0cb492eb41881d11 (diff) | |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Conflicts:
intern/cycles/blender/blender_mesh.cpp
Diffstat (limited to 'release/scripts/startup')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 18a38c84582..7af8be108c1 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1721,6 +1721,12 @@ class VIEW3D_PT_tools_projectpaint(View3DPaintPanel, Panel): sub.active = (ipaint.use_normal_falloff) 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") + layout.prop(ipaint, "seam_bleed") layout.prop(ipaint, "dither") self.unified_paint_settings(layout, context) |