Merge remote-tracking branch 'origin/master' into temp-npr-gpencil-modifiers

12 files changed, 21 insertions, 1 deletions

diff --git a/release/datafiles/icons/brush.sculpt.draw_sharp.dat b/release/datafiles/icons/brush.sculpt.draw_sharp.dat
new file mode 100644
index 00000000000..c3e0c7a7536
--- /dev/null
+++ b/release/datafiles/icons/brush.sculpt.draw_sharp.dat
diff --git a/release/datafiles/icons/brush.sculpt.elastic_deform.dat b/release/datafiles/icons/brush.sculpt.elastic_deform.dat
new file mode 100644
index 00000000000..6d0ea25c1fe
--- /dev/null
+++ b/release/datafiles/icons/brush.sculpt.elastic_deform.dat
diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/brush.sculpt.mask.dat
index a0ae683193d..02efb60857f 100644
--- a/release/datafiles/icons/brush.sculpt.mask.dat
+++ b/release/datafiles/icons/brush.sculpt.mask.dat
diff --git a/release/datafiles/icons/brush.sculpt.pinch.dat b/release/datafiles/icons/brush.sculpt.pinch.dat
index d81c885e144..4a76c725561 100644
--- a/release/datafiles/icons/brush.sculpt.pinch.dat
+++ b/release/datafiles/icons/brush.sculpt.pinch.dat
diff --git a/release/datafiles/icons/brush.sculpt.pose.dat b/release/datafiles/icons/brush.sculpt.pose.dat
new file mode 100644
index 00000000000..6183583ea27
--- /dev/null
+++ b/release/datafiles/icons/brush.sculpt.pose.dat
diff --git a/release/datafiles/icons/brush.sculpt.simplify.dat b/release/datafiles/icons/brush.sculpt.simplify.dat
index a7f6ef47c36..f7de2f97aa1 100644
--- a/release/datafiles/icons/brush.sculpt.simplify.dat
+++ b/release/datafiles/icons/brush.sculpt.simplify.dat
diff --git a/release/datafiles/icons/brush.sculpt.snake_hook.dat b/release/datafiles/icons/brush.sculpt.snake_hook.dat
index 3b0a8b47bd8..64256d93702 100644
--- a/release/datafiles/icons/brush.sculpt.snake_hook.dat
+++ b/release/datafiles/icons/brush.sculpt.snake_hook.dat
diff --git a/release/datafiles/icons/ops.sculpt.border_hide.dat b/release/datafiles/icons/ops.sculpt.border_hide.dat
index c95e81a3099..67cd306805c 100644
--- a/release/datafiles/icons/ops.sculpt.border_hide.dat
+++ b/release/datafiles/icons/ops.sculpt.border_hide.dat
diff --git a/release/datafiles/icons/ops.sculpt.border_mask.dat b/release/datafiles/icons/ops.sculpt.border_mask.dat
index aa4ba9165a3..701b96e31d9 100644
--- a/release/datafiles/icons/ops.sculpt.border_mask.dat
+++ b/release/datafiles/icons/ops.sculpt.border_mask.dat
diff --git a/release/datafiles/icons/ops.sculpt.mesh_filter.dat b/release/datafiles/icons/ops.sculpt.mesh_filter.dat
new file mode 100644
index 00000000000..164e08b78be
--- /dev/null
+++ b/release/datafiles/icons/ops.sculpt.mesh_filter.dat
diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c
index da8d1884851..dc35187ab7e 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -21,6 +21,8 @@
 
 #include "DNA_userdef_types.h"
 #include "DNA_curve_types.h"
+#include "DNA_space_types.h"
+#include "DNA_anim_types.h"
 
 #include "BLI_math_rotation.h"
 
@@ -137,6 +139,7 @@ const UserDef U_default = {
     .glreslimit = 0,
     .curssize = 0,
     .color_picker_type = USER_CP_CIRCLE_HSV,
+    .auto_smoothing_new = FCURVE_SMOOTH_CONT_ACCEL,
     .ipo_new = BEZT_IPO_BEZ,
     .keyhandles_new = HD_AUTO_ANIM,
     .view_frame_type = ZOOM_FRAME_MODE_KEEP_RANGE,
@@ -183,6 +186,8 @@ const UserDef U_default = {
     .opensubdiv_compute_type = 0,
     .gpencil_multisamples = 4,
     .factor_display_type = USER_FACTOR_AS_FACTOR,
+    .render_display_type = USER_RENDER_DISPLAY_WINDOW,
+    .filebrowser_display_type = USER_TEMP_SPACE_DISPLAY_WINDOW,
     .viewport_aa = 8,
 
     .walk_navigation =
@@ -201,6 +206,18 @@ const UserDef U_default = {
             .section_active = USER_SECTION_INTERFACE,
         },
 
+    .file_space_data =
+        {
+            .display_type = FILE_VERTICALDISPLAY,
+            .thumbnail_size = 128,
+            .sort_type = FILE_SORT_ALPHA,
+            .details_flags = FILE_DETAILS_SIZE | FILE_DETAILS_DATETIME,
+            .flag = FILE_HIDE_DOT,
+
+            .temp_win_sizex = 1020,
+            .temp_win_sizey = 600,
+        },
+
     .runtime =
         {
             .is_dirty = 0,
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index ff2a5ae2739..0b9e8beccc1 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -585,6 +585,7 @@ const bTheme U_theme_default = {
     .anim_preview_range = RGBA(0xa14d0066),
     .nla_tweaking = RGBA(0x4df31a4d),
     .nla_tweakdupli = RGBA(0xd90000ff),
+    .nla_track = RGBA(0x424242ff),
     .nla_transition = RGBA(0x1c2630ff),
     .nla_transition_sel = RGBA(0x2e75dbff),
     .nla_meta = RGBA(0x332642ff),
@@ -746,12 +747,12 @@ const bTheme U_theme_default = {
       .back = RGBA(0x333333b3),
       .sub_back = RGBA(0x0000003e),
     },
+    .active = RGBA(0x3b5689ff),
     .vertex_size = 3,
     .outline_width = 1,
     .facedot_size = 4,
     .match = RGBA(0x337f334c),
     .selected_highlight = RGBA(0x223a5bff),
-    .active = RGBA(0x3b5689ff),
     .selected_object = RGBA(0xe96a00ff),
     .active_object = RGBA(0xffaf29ff),
     .edited_object = RGBA(0x00806266),
@@ -914,6 +915,8 @@ const bTheme U_theme_default = {
     .lock_marker = RGBA(0x7f7f7fff),
     .path_before = RGBA(0xff0000ff),
     .path_after = RGBA(0x0000ffff),
+    .path_keyframe_before = RGBA(0xffc4c4ff),
+    .path_keyframe_after = RGBA(0xc4c4ffff),
     .gp_vertex_size = 1,
     .metadatatext = RGBA(0xffffffff),
   },