diff options
Diffstat (limited to 'release/datafiles')
13 files changed, 22 insertions, 31 deletions
diff --git a/release/datafiles/blender_icons16/icon16_force_smokeflow.dat b/release/datafiles/blender_icons16/icon16_force_fluidflow.dat Binary files differindex a5b978a80b1..a5b978a80b1 100644 --- a/release/datafiles/blender_icons16/icon16_force_smokeflow.dat +++ b/release/datafiles/blender_icons16/icon16_force_fluidflow.dat diff --git a/release/datafiles/blender_icons32/icon32_force_smokeflow.dat b/release/datafiles/blender_icons32/icon32_force_fluidflow.dat Binary files differindex 0553f2adac2..0553f2adac2 100644 --- a/release/datafiles/blender_icons32/icon32_force_smokeflow.dat +++ b/release/datafiles/blender_icons32/icon32_force_fluidflow.dat diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index c224c2c3c2d..5ad937e3efb 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -33,9 +33,8 @@ roles: # Default color space sequencer is working in default_sequencer: sRGB - # Color spaces for color picking and texture painting (not internally supported yet) + # Distribution of colors in color picker color_picking: sRGB - texture_paint: Raw # Non-color data data: Non-Color @@ -43,6 +42,13 @@ roles: # CIE XYZ color space XYZ: XYZ + # Specifed by OCIO, not used in Blender + color_timing: Filmic Log + compositing_log: Filmic Log + default: Linear + matte_paint: Linear + texture_paint: Linear + displays: sRGB: - !<View> {name: Standard, colorspace: sRGB} diff --git a/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d b/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d index bd80dd4eae0..66778b93e4e 100644 --- a/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d +++ b/release/datafiles/colormanagement/filmic/filmic_desat65cube.spi3d @@ -1,4 +1,4 @@ -SPILUT 1.0 +spilut 1.0 3 3 65 65 65 0 0 0 0.000175781 0.000175781 0.000175781 diff --git a/release/datafiles/colormanagement/filmic/filmic_false_color.spi3d b/release/datafiles/colormanagement/filmic/filmic_false_color.spi3d index d8fcfd4e70d..b81b18ec643 100644 --- a/release/datafiles/colormanagement/filmic/filmic_false_color.spi3d +++ b/release/datafiles/colormanagement/filmic/filmic_false_color.spi3d @@ -1,4 +1,4 @@ -SPILUT 1.0 +spilut 1.0 3 3 65 65 65 0 0 0 0 0 0 diff --git a/release/datafiles/fonts/bmonofont-i18n.ttf b/release/datafiles/fonts/bmonofont-i18n.ttf Binary files differindex 658ec68f36c..08b3f723d61 100644 --- a/release/datafiles/fonts/bmonofont-i18n.ttf +++ b/release/datafiles/fonts/bmonofont-i18n.ttf diff --git a/release/datafiles/fonts/droidsans.ttf b/release/datafiles/fonts/droidsans.ttf Binary files differindex 04b1ece64ee..eea72f53ccd 100644 --- a/release/datafiles/fonts/droidsans.ttf +++ b/release/datafiles/fonts/droidsans.ttf diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 34d98762cef85b9c065f21a051d1dbe3bf2979b +Subproject 1cc27d5282aa4978ee36663aca857eb550df194 diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex 5dc54c8bd79..babb3e30c6d 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/release/datafiles/splash_2x.png b/release/datafiles/splash_2x.png Binary files differdeleted file mode 100644 index 7f94a491469..00000000000 --- a/release/datafiles/splash_2x.png +++ /dev/null diff --git a/release/datafiles/splash_scale.sh b/release/datafiles/splash_scale.sh deleted file mode 100755 index 8a3f2c6d1eb..00000000000 --- a/release/datafiles/splash_scale.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Use this script to generate splash.png from splash_2x.png. -# Supposed to give best quality image. -# -# Based on ImageMagic documentation, which is interesting -# to read anyway: -# -# http://www.imagemagick.org/Usage/filter -# http://www.imagemagick.org/Usage/filter/nicolas/ - -convert \ - splash_2x.png \ - -colorspace RGB \ - -filter Cosine \ - -resize 50% \ - -colorspace sRGB \ - splash.png diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index ec4b214c5f5..31d0eb8e923 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -19,10 +19,10 @@ /* For constants. */ #include "BLI_math_base.h" -#include "DNA_userdef_types.h" +#include "DNA_anim_types.h" #include "DNA_curve_types.h" #include "DNA_space_types.h" -#include "DNA_anim_types.h" +#include "DNA_userdef_types.h" #include "BLI_math_rotation.h" @@ -31,8 +31,8 @@ #include "BLO_readfile.h" /* own include */ const UserDef U_default = { - .versionfile = BLENDER_VERSION, - .subversionfile = BLENDER_SUBVERSION, + .versionfile = BLENDER_FILE_VERSION, + .subversionfile = BLENDER_FILE_SUBVERSION, .flag = (USER_AUTOSAVE | USER_TOOLTIPS | USER_SAVE_PREVIEWS | USER_RELPATHS | USER_RELEASECONFIRM | USER_SCRIPT_AUTOEXEC_DISABLE | USER_NONEGFRAMES), .dupflag = USER_DUP_MESH | USER_DUP_CURVE | USER_DUP_SURF | USER_DUP_FONT | USER_DUP_MBALL | @@ -64,7 +64,8 @@ const UserDef U_default = { .uiflag2 = USER_REGION_OVERLAP, .gpu_flag = USER_GPU_FLAG_OVERLAY_SMOOTH_WIRE, .app_flag = 0, - .language = 0, + /** Default language of English (1), not Automatic (0). */ + .language = 1, .viewzoom = USER_ZOOM_DOLLY, .mixbufsize = 2048, .audiodevice = 0, @@ -226,6 +227,8 @@ const UserDef U_default = { .sequencer_disk_cache_size_limit = 100, .sequencer_disk_cache_flag = 0, + .collection_instance_empty_size = 1.0f, + .runtime = { .is_dirty = 0, diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index b35d060d884..4d48bb8eaac 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -279,8 +279,8 @@ const bTheme U_theme_default = { .button_text_hi = RGBA(0xffffffff), .navigation_bar = RGBA(0x232323ff), .panelcolors = { - .header = RGBA(0x42424200), - .back = RGBA(0x00000028), + .header = RGBA(0x424242ff), + .back = RGBA(0x383838ff), .sub_back = RGBA(0x00000024), }, .vertex_size = 3, @@ -312,7 +312,7 @@ const bTheme U_theme_default = { .wire = RGBA(0x000000ff), .wire_edit = RGBA(0x000000ff), .select = RGBA(0xed5700ff), - .lamp = RGBA(0x00000028), + .lamp = RGBA(0x00000050), .speaker = RGBA(0x000000ff), .empty = RGBA(0x000000ff), .camera = RGBA(0x000000ff), @@ -697,7 +697,7 @@ const bTheme U_theme_default = { .vertex_size = 3, .outline_width = 1, .facedot_size = 3, - .editmesh_active = RGBA(0xffffff80), + .editmesh_active = RGBA(0xffffff40), .handle_vertex_select = RGBA(0xffff00ff), .handle_vertex_size = 5, .gp_vertex_size = 3, |
