Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/datafiles/userdef/userdef_default.c2
-rw-r--r--release/scripts/modules/bpy/utils/__init__.py2
-rw-r--r--release/scripts/presets/cloth/Cotton.py (renamed from release/scripts/presets/cloth/cotton.py)0
-rw-r--r--release/scripts/presets/cloth/Denim.py (renamed from release/scripts/presets/cloth/denim.py)0
-rw-r--r--release/scripts/presets/cloth/Leather.py (renamed from release/scripts/presets/cloth/leather.py)0
-rw-r--r--release/scripts/presets/cloth/Rubber.py (renamed from release/scripts/presets/cloth/rubber.py)0
-rw-r--r--release/scripts/presets/cloth/Silk.py (renamed from release/scripts/presets/cloth/silk.py)0
-rw-r--r--release/scripts/presets/cycles/integrator/Direct_Light.py (renamed from release/scripts/presets/cycles/integrator/direct_light.py)0
-rw-r--r--release/scripts/presets/cycles/integrator/Full_Global_Illumination.py (renamed from release/scripts/presets/cycles/integrator/full_global_illumination.py)0
-rw-r--r--release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py (renamed from release/scripts/presets/cycles/integrator/limited_global_illumination.py)0
-rw-r--r--release/scripts/presets/cycles/sampling/Final.py (renamed from release/scripts/presets/cycles/sampling/final.py)0
-rw-r--r--release/scripts/presets/cycles/sampling/Preview.py (renamed from release/scripts/presets/cycles/sampling/preview.py)0
-rw-r--r--release/scripts/presets/ffmpeg/H264_in_MP4.py (renamed from release/scripts/presets/ffmpeg/h264_in_MP4.py)0
-rw-r--r--release/scripts/presets/ffmpeg/H264_in_Matroska.py (renamed from release/scripts/presets/ffmpeg/h264_in_Matroska.py)0
-rw-r--r--release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py (renamed from release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py)0
-rw-r--r--release/scripts/presets/ffmpeg/Ogg_Theora.py (renamed from release/scripts/presets/ffmpeg/ogg_theora.py)0
-rw-r--r--release/scripts/presets/ffmpeg/Xvid.py (renamed from release/scripts/presets/ffmpeg/xvid.py)0
-rw-r--r--release/scripts/presets/fluid/Honey.py (renamed from release/scripts/presets/fluid/honey.py)0
-rw-r--r--release/scripts/presets/fluid/Oil.py (renamed from release/scripts/presets/fluid/oil.py)0
-rw-r--r--release/scripts/presets/fluid/Water.py (renamed from release/scripts/presets/fluid/water.py)0
-rw-r--r--release/scripts/presets/gpencil_material/Fill_Only.py (renamed from release/scripts/presets/gpencil_material/fill_only.py)0
-rw-r--r--release/scripts/presets/gpencil_material/Stroke_Only.py (renamed from release/scripts/presets/gpencil_material/stroke_only.py)0
-rw-r--r--release/scripts/presets/gpencil_material/Stroke_and_Fill.py (renamed from release/scripts/presets/gpencil_material/stroke_and_fill.py)0
-rw-r--r--release/scripts/presets/hair_dynamics/Default.py (renamed from release/scripts/presets/hair_dynamics/default.py)0
-rw-r--r--release/scripts/presets/interface_theme/Blender_Dark.xml (renamed from release/scripts/presets/interface_theme/blender_dark.xml)0
-rw-r--r--release/scripts/presets/interface_theme/Blender_Light.xml (renamed from release/scripts/presets/interface_theme/blender_light.xml)0
-rw-r--r--release/scripts/presets/keyconfig/Blender.py (renamed from release/scripts/presets/keyconfig/blender.py)0
-rw-r--r--release/scripts/presets/keyconfig/Blender_27x.py (renamed from release/scripts/presets/keyconfig/blender_27x.py)0
-rw-r--r--release/scripts/presets/keyconfig/Industry_Compatible.py (renamed from release/scripts/presets/keyconfig/industry_compatible.py)0
-rw-r--r--release/scripts/presets/render/4K_UHDTV_2160p.py (renamed from release/scripts/presets/render/4k_UHDTV_2160p.py)0
-rw-r--r--release/scripts/presets/tracking_settings/Blurry_Footage.py (renamed from release/scripts/presets/tracking_settings/blurry_footage.py)0
-rw-r--r--release/scripts/presets/tracking_settings/Default.py (renamed from release/scripts/presets/tracking_settings/default.py)0
-rw-r--r--release/scripts/presets/tracking_settings/Fast_Motion.py (renamed from release/scripts/presets/tracking_settings/fast_motion.py)0
-rw-r--r--release/scripts/presets/tracking_settings/Planar.py (renamed from release/scripts/presets/tracking_settings/planar.py)0
-rw-r--r--release/scripts/presets/tracking_track_color/Default.py (renamed from release/scripts/presets/tracking_track_color/default.py)0
-rw-r--r--release/scripts/presets/tracking_track_color/Far_Plane.py (renamed from release/scripts/presets/tracking_track_color/far_plane.py)0
-rw-r--r--release/scripts/presets/tracking_track_color/Near_Plane.py (renamed from release/scripts/presets/tracking_track_color/near_plane.py)0
-rw-r--r--release/scripts/presets/tracking_track_color/Object.py (renamed from release/scripts/presets/tracking_track_color/object.py)0
-rw-r--r--source/blender/makesdna/DNA_windowmanager_types.h2
39 files changed, 3 insertions, 3 deletions
diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c
index 2265e70df39..6383d7dfcca 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -105,7 +105,7 @@ const UserDef U_default = {
.autoexec_paths = {NULL},
.user_menus = {NULL},
- .keyconfigstr = "blender",
+ .keyconfigstr = "Blender",
.undosteps = 32,
.undomemory = 0,
.gp_manhattandist = 1,
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index 897010e80cf..c81aac8fdeb 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -624,7 +624,7 @@ def keyconfig_init():
active_config = _preferences.keymap.active_keyconfig
# Load the default key configuration.
- default_filepath = preset_find("blender", "keyconfig")
+ default_filepath = preset_find("Blender", "keyconfig")
keyconfig_set(default_filepath)
# Set the active key configuration if different
diff --git a/release/scripts/presets/cloth/cotton.py b/release/scripts/presets/cloth/Cotton.py
index 9e766416a75..9e766416a75 100644
--- a/release/scripts/presets/cloth/cotton.py
+++ b/release/scripts/presets/cloth/Cotton.py
diff --git a/release/scripts/presets/cloth/denim.py b/release/scripts/presets/cloth/Denim.py
index 7abf4469709..7abf4469709 100644
--- a/release/scripts/presets/cloth/denim.py
+++ b/release/scripts/presets/cloth/Denim.py
diff --git a/release/scripts/presets/cloth/leather.py b/release/scripts/presets/cloth/Leather.py
index 8ba9ff7dabe..8ba9ff7dabe 100644
--- a/release/scripts/presets/cloth/leather.py
+++ b/release/scripts/presets/cloth/Leather.py
diff --git a/release/scripts/presets/cloth/rubber.py b/release/scripts/presets/cloth/Rubber.py
index 0d791fab2a9..0d791fab2a9 100644
--- a/release/scripts/presets/cloth/rubber.py
+++ b/release/scripts/presets/cloth/Rubber.py
diff --git a/release/scripts/presets/cloth/silk.py b/release/scripts/presets/cloth/Silk.py
index af867cf9c60..af867cf9c60 100644
--- a/release/scripts/presets/cloth/silk.py
+++ b/release/scripts/presets/cloth/Silk.py
diff --git a/release/scripts/presets/cycles/integrator/direct_light.py b/release/scripts/presets/cycles/integrator/Direct_Light.py
index 701aa10d556..701aa10d556 100644
--- a/release/scripts/presets/cycles/integrator/direct_light.py
+++ b/release/scripts/presets/cycles/integrator/Direct_Light.py
diff --git a/release/scripts/presets/cycles/integrator/full_global_illumination.py b/release/scripts/presets/cycles/integrator/Full_Global_Illumination.py
index a03c6c8bd64..a03c6c8bd64 100644
--- a/release/scripts/presets/cycles/integrator/full_global_illumination.py
+++ b/release/scripts/presets/cycles/integrator/Full_Global_Illumination.py
diff --git a/release/scripts/presets/cycles/integrator/limited_global_illumination.py b/release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py
index d37bf46c705..d37bf46c705 100644
--- a/release/scripts/presets/cycles/integrator/limited_global_illumination.py
+++ b/release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py
diff --git a/release/scripts/presets/cycles/sampling/final.py b/release/scripts/presets/cycles/sampling/Final.py
index f1222d927c1..f1222d927c1 100644
--- a/release/scripts/presets/cycles/sampling/final.py
+++ b/release/scripts/presets/cycles/sampling/Final.py
diff --git a/release/scripts/presets/cycles/sampling/preview.py b/release/scripts/presets/cycles/sampling/Preview.py
index c16449e2c8f..c16449e2c8f 100644
--- a/release/scripts/presets/cycles/sampling/preview.py
+++ b/release/scripts/presets/cycles/sampling/Preview.py
diff --git a/release/scripts/presets/ffmpeg/h264_in_MP4.py b/release/scripts/presets/ffmpeg/H264_in_MP4.py
index 0e9c32c4878..0e9c32c4878 100644
--- a/release/scripts/presets/ffmpeg/h264_in_MP4.py
+++ b/release/scripts/presets/ffmpeg/H264_in_MP4.py
diff --git a/release/scripts/presets/ffmpeg/h264_in_Matroska.py b/release/scripts/presets/ffmpeg/H264_in_Matroska.py
index 1fe066dc4bf..1fe066dc4bf 100644
--- a/release/scripts/presets/ffmpeg/h264_in_Matroska.py
+++ b/release/scripts/presets/ffmpeg/H264_in_Matroska.py
diff --git a/release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py b/release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py
index eb1889d272f..eb1889d272f 100644
--- a/release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py
+++ b/release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py
diff --git a/release/scripts/presets/ffmpeg/ogg_theora.py b/release/scripts/presets/ffmpeg/Ogg_Theora.py
index b450b67fd98..b450b67fd98 100644
--- a/release/scripts/presets/ffmpeg/ogg_theora.py
+++ b/release/scripts/presets/ffmpeg/Ogg_Theora.py
diff --git a/release/scripts/presets/ffmpeg/xvid.py b/release/scripts/presets/ffmpeg/Xvid.py
index dba0f71c279..dba0f71c279 100644
--- a/release/scripts/presets/ffmpeg/xvid.py
+++ b/release/scripts/presets/ffmpeg/Xvid.py
diff --git a/release/scripts/presets/fluid/honey.py b/release/scripts/presets/fluid/Honey.py
index 0ed3658470a..0ed3658470a 100644
--- a/release/scripts/presets/fluid/honey.py
+++ b/release/scripts/presets/fluid/Honey.py
diff --git a/release/scripts/presets/fluid/oil.py b/release/scripts/presets/fluid/Oil.py
index c33e5d4b6cf..c33e5d4b6cf 100644
--- a/release/scripts/presets/fluid/oil.py
+++ b/release/scripts/presets/fluid/Oil.py
diff --git a/release/scripts/presets/fluid/water.py b/release/scripts/presets/fluid/Water.py
index f34ecc834ff..f34ecc834ff 100644
--- a/release/scripts/presets/fluid/water.py
+++ b/release/scripts/presets/fluid/Water.py
diff --git a/release/scripts/presets/gpencil_material/fill_only.py b/release/scripts/presets/gpencil_material/Fill_Only.py
index aa4d58a8c10..aa4d58a8c10 100644
--- a/release/scripts/presets/gpencil_material/fill_only.py
+++ b/release/scripts/presets/gpencil_material/Fill_Only.py
diff --git a/release/scripts/presets/gpencil_material/stroke_only.py b/release/scripts/presets/gpencil_material/Stroke_Only.py
index 4e02b108e01..4e02b108e01 100644
--- a/release/scripts/presets/gpencil_material/stroke_only.py
+++ b/release/scripts/presets/gpencil_material/Stroke_Only.py
diff --git a/release/scripts/presets/gpencil_material/stroke_and_fill.py b/release/scripts/presets/gpencil_material/Stroke_and_Fill.py
index 3572036de5e..3572036de5e 100644
--- a/release/scripts/presets/gpencil_material/stroke_and_fill.py
+++ b/release/scripts/presets/gpencil_material/Stroke_and_Fill.py
diff --git a/release/scripts/presets/hair_dynamics/default.py b/release/scripts/presets/hair_dynamics/Default.py
index 830d28a76f0..830d28a76f0 100644
--- a/release/scripts/presets/hair_dynamics/default.py
+++ b/release/scripts/presets/hair_dynamics/Default.py
diff --git a/release/scripts/presets/interface_theme/blender_dark.xml b/release/scripts/presets/interface_theme/Blender_Dark.xml
index 8bbb747447b..8bbb747447b 100644
--- a/release/scripts/presets/interface_theme/blender_dark.xml
+++ b/release/scripts/presets/interface_theme/Blender_Dark.xml
diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/Blender_Light.xml
index 91ccd574c31..91ccd574c31 100644
--- a/release/scripts/presets/interface_theme/blender_light.xml
+++ b/release/scripts/presets/interface_theme/Blender_Light.xml
diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/Blender.py
index eb66c961472..eb66c961472 100644
--- a/release/scripts/presets/keyconfig/blender.py
+++ b/release/scripts/presets/keyconfig/Blender.py
diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/Blender_27x.py
index 2a7f0b07fa6..2a7f0b07fa6 100644
--- a/release/scripts/presets/keyconfig/blender_27x.py
+++ b/release/scripts/presets/keyconfig/Blender_27x.py
diff --git a/release/scripts/presets/keyconfig/industry_compatible.py b/release/scripts/presets/keyconfig/Industry_Compatible.py
index 09a43452e93..09a43452e93 100644
--- a/release/scripts/presets/keyconfig/industry_compatible.py
+++ b/release/scripts/presets/keyconfig/Industry_Compatible.py
diff --git a/release/scripts/presets/render/4k_UHDTV_2160p.py b/release/scripts/presets/render/4K_UHDTV_2160p.py
index 4517d2f435e..4517d2f435e 100644
--- a/release/scripts/presets/render/4k_UHDTV_2160p.py
+++ b/release/scripts/presets/render/4K_UHDTV_2160p.py
diff --git a/release/scripts/presets/tracking_settings/blurry_footage.py b/release/scripts/presets/tracking_settings/Blurry_Footage.py
index 253a8f395ba..253a8f395ba 100644
--- a/release/scripts/presets/tracking_settings/blurry_footage.py
+++ b/release/scripts/presets/tracking_settings/Blurry_Footage.py
diff --git a/release/scripts/presets/tracking_settings/default.py b/release/scripts/presets/tracking_settings/Default.py
index 3d2481ce7ad..3d2481ce7ad 100644
--- a/release/scripts/presets/tracking_settings/default.py
+++ b/release/scripts/presets/tracking_settings/Default.py
diff --git a/release/scripts/presets/tracking_settings/fast_motion.py b/release/scripts/presets/tracking_settings/Fast_Motion.py
index 4294b7327d1..4294b7327d1 100644
--- a/release/scripts/presets/tracking_settings/fast_motion.py
+++ b/release/scripts/presets/tracking_settings/Fast_Motion.py
diff --git a/release/scripts/presets/tracking_settings/planar.py b/release/scripts/presets/tracking_settings/Planar.py
index a099b3a800d..a099b3a800d 100644
--- a/release/scripts/presets/tracking_settings/planar.py
+++ b/release/scripts/presets/tracking_settings/Planar.py
diff --git a/release/scripts/presets/tracking_track_color/default.py b/release/scripts/presets/tracking_track_color/Default.py
index 3213d6e0c83..3213d6e0c83 100644
--- a/release/scripts/presets/tracking_track_color/default.py
+++ b/release/scripts/presets/tracking_track_color/Default.py
diff --git a/release/scripts/presets/tracking_track_color/far_plane.py b/release/scripts/presets/tracking_track_color/Far_Plane.py
index 579d5562642..579d5562642 100644
--- a/release/scripts/presets/tracking_track_color/far_plane.py
+++ b/release/scripts/presets/tracking_track_color/Far_Plane.py
diff --git a/release/scripts/presets/tracking_track_color/near_plane.py b/release/scripts/presets/tracking_track_color/Near_Plane.py
index 790429ce7a1..790429ce7a1 100644
--- a/release/scripts/presets/tracking_track_color/near_plane.py
+++ b/release/scripts/presets/tracking_track_color/Near_Plane.py
diff --git a/release/scripts/presets/tracking_track_color/object.py b/release/scripts/presets/tracking_track_color/Object.py
index 5cb663d3f97..5cb663d3f97 100644
--- a/release/scripts/presets/tracking_track_color/object.py
+++ b/release/scripts/presets/tracking_track_color/Object.py
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index f07af2c14a0..a3aaf3ee937 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -215,7 +215,7 @@ enum {
(WM_OUTLINER_SYNC_SELECT_FROM_OBJECT | WM_OUTLINER_SYNC_SELECT_FROM_EDIT_BONE | \
WM_OUTLINER_SYNC_SELECT_FROM_POSE_BONE | WM_OUTLINER_SYNC_SELECT_FROM_SEQUENCE)
-#define WM_KEYCONFIG_STR_DEFAULT "blender"
+#define WM_KEYCONFIG_STR_DEFAULT "Blender"
/* IME is win32 only! */
#if !defined(WIN32) && !defined(DNA_DEPRECATED)