svn merge ^/trunk/blender -c60579 -c60599 -c60605 -c60626 -c60630 -c60635 -c60639 -c60644 -c60649 -c60673 -c60674 -c60675 -c60680 -c60682 -c60683 -c60685 -c60689 -c60695 -c60703 -c60707 -c60708 -c60709 -c60712 -c60712 -c60723 -c60724 -c60731 -c60740 -c60742 -c60743 -c60747 -c60749 -c60752 -c60753 -c60753 -c60755

4 files changed, 14 insertions, 11 deletions

diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index dd6206fff99..83bd8dbda5e 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -32,7 +32,7 @@ from freestyle import BackboneStretcherShader, BezierCurveShader, BinaryPredicat
     FalseBP1D, FalseUP1D, GuidingLinesShader, Interface0DIterator, Nature, Noise, Normal2DF0D, Operators, \
     PolygonalizationShader, QuantitativeInvisibilityF1D, QuantitativeInvisibilityUP1D, SamplingShader, \
     SpatialNoiseShader, StrokeAttribute, StrokeShader, TipRemoverShader, TrueBP1D, TrueUP1D, UnaryPredicate0D, \
-    UnaryPredicate1D, VertexOrientation2DF0D, WithinImageBoundaryUP1D, ContextFunctions
+    UnaryPredicate1D, VertexOrientation2DF0D, WithinImageBoundaryUP1D, ContextFunctions, TVertex
 from Functions0D import CurveMaterialF0D
 from PredicatesU1D import pyNatureUP1D
 from logical_operators import AndUP1D, NotUP1D, OrUP1D
@@ -1085,6 +1085,8 @@ def iter_three_segments(stroke):
             it3.increment()
             it4.increment()
 
+def is_tvertex(svertex):
+    return type(svertex.viewvertex) is TVertex
 
 class StrokeCleaner(StrokeShader):
     def shade(self, stroke):
@@ -1092,7 +1094,10 @@ class StrokeCleaner(StrokeShader):
             seg1 = sv2.point - sv1.point
             seg2 = sv3.point - sv2.point
             seg3 = sv4.point - sv3.point
-            if seg1.dot(seg2) < 0.0 and seg2.dot(seg3) < 0.0:
+            if not ((is_tvertex(sv2.first_svertex) and is_tvertex(sv2.second_svertex)) or
+                    (is_tvertex(sv3.first_svertex) and is_tvertex(sv3.second_svertex))):
+                continue
+            if seg1.dot(seg2) < 0.0 and seg2.dot(seg3) < 0.0 and seg2.length < 0.01:
                 #print(sv2.first_svertex.viewvertex)
                 #print(sv2.second_svertex.viewvertex)
                 #print(sv3.first_svertex.viewvertex)
diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py
index 727e9935bcc..60590158fbd 100644
--- a/release/scripts/modules/rna_keymap_ui.py
+++ b/release/scripts/modules/rna_keymap_ui.py
@@ -74,15 +74,14 @@ def draw_km(display_keymaps, kc, km, children, layout, level):
     row.prop(km, "show_expanded_children", text="", emboss=False)
     row.label(text=km.name, text_ctxt=i18n_contexts.id_windowmanager)
 
-    row.label()
-    row.label()
+    subrow = row.row()
+    subrow.alignment = 'RIGHT'
 
-    if km.is_modal:
-        row.label(text="", icon='LINKED')
     if km.is_user_modified:
-        row.operator("wm.keymap_restore", text="Restore")
-    else:
-        row.label()
+        subrow.operator("wm.keymap_restore", text="Restore")
+    if km.is_modal:
+        subrow.label(text="", icon='LINKED')
+    del subrow
 
     if km.show_expanded_children:
         if children:
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index eff538971c0..bb0b137da0a 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -518,7 +518,7 @@ class MATERIAL_PT_sss(MaterialButtonsPanel, Panel):
         layout.active = (sss.use) and (not mat.use_shadeless)
 
         row = layout.row().split()
-        sub = row.row(align=True).split(percentage=0.75)
+        sub = row.row(align=True).split(align=True, percentage=0.75)
         sub.menu("MATERIAL_MT_sss_presets", text=bpy.types.MATERIAL_MT_sss_presets.bl_label)
         sub.operator("material.sss_preset_add", text="", icon='ZOOMIN')
         sub.operator("material.sss_preset_add", text="", icon='ZOOMOUT').remove_active = True
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 398d1596216..0963534a214 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -106,7 +106,6 @@ class IMAGE_MT_select(Menu):
 
         layout.operator("uv.select_all").action = 'TOGGLE'
         layout.operator("uv.select_all", text="Inverse").action = 'INVERT'
-        layout.operator("uv.select_split")
 
         layout.separator()