Merge branch 'master' into alembic_pointcache

13 files changed, 213 insertions, 64 deletions

diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index 1cf9a3bb36e..7ecc9768d57 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -6,7 +6,7 @@ ocio_profile_version: 1
 
 search_path: luts
 strictparsing: true
-luma: [0.2126, 0.7152, 0.0722]
+luma: [0.2126729, 0.7151522, 0.0721750]
 
 description: RRT version ut33
 
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index 4126dde1225..cdb3a3fedb5 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -576,6 +576,8 @@ class SpellChecker:
         "btx",
         "cineon",
         "dpx",
+        "dwaa",
+        "dwab",
         "dxf",
         "eps",
         "exr",
diff --git a/release/scripts/presets/interface_theme/back_to_black.xml b/release/scripts/presets/interface_theme/back_to_black.xml
index 6520d81b900..05613e79411 100644
--- a/release/scripts/presets/interface_theme/back_to_black.xml
+++ b/release/scripts/presets/interface_theme/back_to_black.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#222222"
                    wire="#888888"
                    wire_edit="#000000"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#c1d40028"
                    speaker="#535353"
                    camera="#000000"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#5a5a5a"
                    skin_root="#000000"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#0f13bb"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#0f13bb"
                         vertex_select="#ff8500"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#282828"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#282828"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#272727"
-                     frame_current="#2e5820">
+                     frame_current="#2e5820"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#000000"
                              title="#5d5d5d"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#ffffff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#ffffff"
                        node_active="#ffffff"
                        wire="#6eafff"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#0094af"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#0094af"
                        marker="#7f7f00"
                        active_marker="#ffffff"
                        selected_marker="#ffff00"
diff --git a/release/scripts/presets/interface_theme/blender_24x.xml b/release/scripts/presets/interface_theme/blender_24x.xml
index bb9b03d56ea..1ea335c7d73 100644
--- a/release/scripts/presets/interface_theme/blender_24x.xml
+++ b/release/scripts/presets/interface_theme/blender_24x.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#4c4c4c"
                    wire="#000000"
                    wire_edit="#000000"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#00000028"
                    speaker="#000000"
                    camera="#000000"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#000000"
                    skin_root="#b44d4d"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#000000"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#000000"
                         vertex_select="#ff8500"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#404040"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#404040"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#5b5b5b"
-                     frame_current="#60c040">
+                     frame_current="#60c040"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#999999"
                              title="#000000"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#ffffff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#ffffff"
                        node_active="#ffffff"
                        wire="#000000"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#7f7f00"
                        active_marker="#ffffff"
                        selected_marker="#ffff00"
diff --git a/release/scripts/presets/interface_theme/elsyiun.xml b/release/scripts/presets/interface_theme/elsyiun.xml
index 6734850f876..5cb7af1ccc2 100644
--- a/release/scripts/presets/interface_theme/elsyiun.xml
+++ b/release/scripts/presets/interface_theme/elsyiun.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#585858"
                    wire="#000000"
                    wire_edit="#000000"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#00000028"
                    speaker="#000000"
                    camera="#000000"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#000000"
                    skin_root="#000000"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#32adec"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#32adec"
                         vertex_select="#be6925"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#818181"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#818181"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#5b5b5b"
-                     frame_current="#60c040">
+                     frame_current="#60c040"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#4b4b4b"
                              title="#000000"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#ffffff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#ffffff"
                        node_active="#ffffff"
                        wire="#000000"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#7f7f00"
                        active_marker="#ffffff"
                        selected_marker="#ffff00"
diff --git a/release/scripts/presets/interface_theme/flatty_light.xml b/release/scripts/presets/interface_theme/flatty_light.xml
index e22d3471863..deb1101302a 100644
--- a/release/scripts/presets/interface_theme/flatty_light.xml
+++ b/release/scripts/presets/interface_theme/flatty_light.xml
@@ -242,8 +242,8 @@
                    wire="#000000"
                    wire_edit="#808080"
                    gp_vertex="#000000"
-                   gp_vertex_select="#000000"
-                   gp_vertex_size="1"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#00000028"
                    speaker="#000000"
                    camera="#000000"
@@ -299,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#000000"
                    skin_root="#b44d4d"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -546,8 +547,8 @@
     </dopesheet_editor>
     <image_editor>
       <ThemeImageEditor gp_vertex="#000000"
-                        gp_vertex_select="#000000"
-                        gp_vertex_size="1"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
                         vertex="#000000"
                         vertex_select="#ff8500"
                         vertex_size="3"
@@ -612,8 +613,8 @@
     </image_editor>
     <sequence_editor>
       <ThemeSequenceEditor gp_vertex="#000000"
-                           gp_vertex_select="#000000"
-                           gp_vertex_size="1"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
                            grid="#404040"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
@@ -726,8 +727,8 @@
     <timeline>
       <ThemeTimeline grid="#5b5b5b"
                      frame_current="#60c040"
-                     time_keyframe="#000000"
-                     time_grease_pencil="#000000">
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#727272"
                              title="#000000"
@@ -757,8 +758,8 @@
     </timeline>
     <node_editor>
       <ThemeNodeEditor gp_vertex="#000000"
-                       gp_vertex_select="#000000"
-                       gp_vertex_size="1"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
                        node_selected="#f15800"
                        node_active="#f15800"
                        wire="#a7a7a7"
@@ -1144,31 +1145,31 @@
     <panel_title>
       <ThemeFontStyle points="12"
                       font_kerning_style="FITTED"
-                      shadow="2"
-                      shadow_offset_x="2"
-                      shadow_offset_y="-2"
-                      shadow_alpha="0.1"
+                      shadow="1"
+                      shadow_offset_x="0"
+                      shadow_offset_y="-1"
+                      shadow_alpha="0.15"
                       shadow_value="1">
       </ThemeFontStyle>
     </panel_title>
     <widget_label>
       <ThemeFontStyle points="11"
                       font_kerning_style="FITTED"
-                      shadow="1"
-                      shadow_offset_x="1"
+                      shadow="3"
+                      shadow_offset_x="0"
                       shadow_offset_y="-1"
-                      shadow_alpha="0.2"
+                      shadow_alpha="0.15"
                       shadow_value="1">
       </ThemeFontStyle>
     </widget_label>
     <widget>
       <ThemeFontStyle points="11"
                       font_kerning_style="FITTED"
-                      shadow="1"
-                      shadow_offset_x="1"
-                      shadow_offset_y="-1"
-                      shadow_alpha="0.1"
-                      shadow_value="1">
+                      shadow="0"
+                      shadow_offset_x="0"
+                      shadow_offset_y="0"
+                      shadow_alpha="0.25"
+                      shadow_value="0">
       </ThemeFontStyle>
     </widget>
   </ThemeStyle>
diff --git a/release/scripts/presets/interface_theme/graph.xml b/release/scripts/presets/interface_theme/graph.xml
index 1cb9a8985e4..063524a9187 100644
--- a/release/scripts/presets/interface_theme/graph.xml
+++ b/release/scripts/presets/interface_theme/graph.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#585858"
                    wire="#000000"
                    wire_edit="#161616"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#00000028"
                    speaker="#000000"
                    camera="#8d8c8d"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#000000"
                    skin_root="#000000"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#000000"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#000000"
                         vertex_select="#0094ff"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#6e6e6e"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#6e6e6e"
                            window_sliders="#a0a0a0"
                            movie_strip="#5794c3"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#6d6d6d"
-                     frame_current="#4291dc">
+                     frame_current="#4291dc"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#5d5d5d"
                              title="#e4e4e4"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#fff4f8"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#fff4f8"
                        node_active="#ffffff"
                        wire="#292929"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#7f7f00"
                        active_marker="#ffffff"
                        selected_marker="#ffff00"
diff --git a/release/scripts/presets/interface_theme/hexagon.xml b/release/scripts/presets/interface_theme/hexagon.xml
index 40228e832a7..74adb9f9d27 100644
--- a/release/scripts/presets/interface_theme/hexagon.xml
+++ b/release/scripts/presets/interface_theme/hexagon.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#5e5e83"
                    wire="#000000"
                    wire_edit="#000000"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#00000028"
                    speaker="#000000"
                    camera="#000000"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#000000"
                    skin_root="#000000"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#334cca"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#334cca"
                         vertex_select="#50c8ff"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#404040"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#404040"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#58587c"
-                     frame_current="#60c040">
+                     frame_current="#60c040"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#646875"
                              title="#000000"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#ffffff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#ffffff"
                        node_active="#ffffff"
                        wire="#000000"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#7f7f00"
                        active_marker="#ffffff"
                        selected_marker="#ffff00"
diff --git a/release/scripts/presets/interface_theme/rtheme.xml b/release/scripts/presets/interface_theme/rtheme.xml
index 268b2e0f1ae..c25806729b9 100644
--- a/release/scripts/presets/interface_theme/rtheme.xml
+++ b/release/scripts/presets/interface_theme/rtheme.xml
@@ -981,7 +981,7 @@
     <clip_editor>
       <ThemeClipEditor gp_vertex="#000000"
                        gp_vertex_select="#000000"
-                       gp_vertex_size="0"
+                       gp_vertex_size="1"
                        marker_outline="#000000"
                        marker="#7f7f00"
                        active_marker="#ffffff"
diff --git a/release/scripts/presets/interface_theme/science_lab.xml b/release/scripts/presets/interface_theme/science_lab.xml
index 98dddfb0014..b767e4a837b 100644
--- a/release/scripts/presets/interface_theme/science_lab.xml
+++ b/release/scripts/presets/interface_theme/science_lab.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#416064"
                    wire="#439ad2"
                    wire_edit="#7f7f7f"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#dbac00b9"
                    speaker="#229cd8"
                    camera="#e28400"
@@ -296,6 +299,7 @@
                    bundle_solid="#6e6e6e"
                    camera_path="#9f5500"
                    skin_root="#f1b66e"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#bcf7fa"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#bcf7fa"
                         vertex_select="#ffc700"
                         vertex_size="5"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#404040"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#404040"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#5b5b5b"
-                     frame_current="#bac6af">
+                     frame_current="#bac6af"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#333333"
                              title="#000000"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#6ebdff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#6ebdff"
                        node_active="#fefff3"
                        wire="#9effc5"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#7f7f00"
                        active_marker="#ffffff"
                        selected_marker="#ffff00"
diff --git a/release/scripts/presets/interface_theme/softimage.xml b/release/scripts/presets/interface_theme/softimage.xml
index d58e04619ed..5b63a775680 100644
--- a/release/scripts/presets/interface_theme/softimage.xml
+++ b/release/scripts/presets/interface_theme/softimage.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#6b6b6b"
                    wire="#242424"
                    wire_edit="#000000"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#ffe56666"
                    speaker="#c2e787"
                    camera="#000000"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#000000"
                    skin_root="#000000"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#000000"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#000000"
                         vertex_select="#ffffff"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#afafaf"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#afafaf"
                            window_sliders="#777777"
                            movie_strip="#87a4c3"
                            movieclip_strip="#95add0"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#918d8c"
-                     frame_current="#f06868">
+                     frame_current="#f06868"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#aca8a7"
                              title="#cccccc"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#ffffff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#ffffff"
                        node_active="#ffffff"
                        wire="#222222"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#71cd7f"
                        active_marker="#ffffff"
                        selected_marker="#ff2f7a"
diff --git a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
index b2743f36c02..d1c8b0a23ff 100644
--- a/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
+++ b/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
@@ -241,6 +241,9 @@
       <ThemeView3D grid="#3c3b37"
                    wire="#93237f"
                    wire_edit="#93237f"
+                   gp_vertex="#000000"
+                   gp_vertex_select="#ff8500"
+                   gp_vertex_size="3"
                    lamp="#ffffff34"
                    speaker="#93237f"
                    camera="#159dce"
@@ -296,6 +299,7 @@
                    bundle_solid="#c8c8c8"
                    camera_path="#7dbd00"
                    skin_root="#000000"
+                   clipping_border_3d="#313131ff"
                    paint_curve_handle="#7fff7f7f"
                    paint_curve_pivot="#ff7f7f7f">
         <space>
@@ -542,7 +546,10 @@
       </ThemeDopeSheet>
     </dopesheet_editor>
     <image_editor>
-      <ThemeImageEditor vertex="#000000"
+      <ThemeImageEditor gp_vertex="#000000"
+                        gp_vertex_select="#ff8500"
+                        gp_vertex_size="3"
+                        vertex="#000000"
                         vertex_select="#f47421"
                         vertex_size="3"
                         vertex_unreferenced="#000000"
@@ -605,7 +612,10 @@
       </ThemeImageEditor>
     </image_editor>
     <sequence_editor>
-      <ThemeSequenceEditor grid="#282828"
+      <ThemeSequenceEditor gp_vertex="#000000"
+                           gp_vertex_select="#ff8500"
+                           gp_vertex_size="3"
+                           grid="#282828"
                            window_sliders="#a0a0a0"
                            movie_strip="#516987"
                            movieclip_strip="#20208f"
@@ -716,7 +726,9 @@
     </text_editor>
     <timeline>
       <ThemeTimeline grid="#272727"
-                     frame_current="#f47421">
+                     frame_current="#f47421"
+                     time_keyframe="#ddd700"
+                     time_grease_pencil="#b5e61d">
         <space>
           <ThemeSpaceGeneric back="#131311"
                              title="#000000"
@@ -745,7 +757,10 @@
       </ThemeTimeline>
     </timeline>
     <node_editor>
-      <ThemeNodeEditor node_selected="#ffffff"
+      <ThemeNodeEditor gp_vertex="#000000"
+                       gp_vertex_select="#ff8500"
+                       gp_vertex_size="3"
+                       node_selected="#ffffff"
                        node_active="#ffffff"
                        wire="#f45b00"
                        wire_inner="#737373"
@@ -964,7 +979,10 @@
       </ThemeConsole>
     </console>
     <clip_editor>
-      <ThemeClipEditor marker_outline="#000000"
+      <ThemeClipEditor gp_vertex="#000000"
+                       gp_vertex_select="#000000"
+                       gp_vertex_size="1"
+                       marker_outline="#000000"
                        marker="#76243b"
                        active_marker="#ffffff"
                        selected_marker="#d5ff00"
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index c65cebfde10..128e24a6d68 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2710,6 +2710,7 @@ class VIEW3D_MT_edit_armature(Menu):
         layout.separator()
 
         layout.operator_context = 'EXEC_AREA'
+        layout.operator("armature.symmetrize")
         layout.operator("armature.autoside_names", text="AutoName Left/Right").type = 'XAXIS'
         layout.operator("armature.autoside_names", text="AutoName Front/Back").type = 'YAXIS'
         layout.operator("armature.autoside_names", text="AutoName Top/Bottom").type = 'ZAXIS'
@@ -2748,6 +2749,7 @@ class VIEW3D_MT_armature_specials(Menu):
         layout.operator("armature.autoside_names", text="AutoName Front/Back").type = 'YAXIS'
         layout.operator("armature.autoside_names", text="AutoName Top/Bottom").type = 'ZAXIS'
         layout.operator("armature.flip_names", text="Flip Names")
+        layout.operator("armature.symmetrize")
 
 
 class VIEW3D_MT_edit_armature_parent(Menu):