[Bf-blender-cvs] [01d49d1542c] master: Presets: Cleanup preset naming

Nathan Craddock noreply at git.blender.org
Thu Feb 4 01:51:26 CET 2021


Commit: 01d49d1542cee0da2a7629443f9534bc5cec5a55
Author: Nathan Craddock
Date:   Wed Feb 3 16:02:04 2021 -0700
Branches: master
https://developer.blender.org/rB01d49d1542cee0da2a7629443f9534bc5cec5a55

Presets: Cleanup preset naming

Before committing D10224, bundled preset names that are lowercase need
updating to title case for display in the UI. This changes several of
the preset file names to title case, and fixes a couple of other naming
issues in the preset names. A few strings in the code are also changed
to reflect the new filename of the Blender keymap.

===================================================================

M	release/datafiles/userdef/userdef_default.c
M	release/scripts/modules/bpy/utils/__init__.py
R100	release/scripts/presets/cloth/cotton.py	release/scripts/presets/cloth/Cotton.py
R100	release/scripts/presets/cloth/denim.py	release/scripts/presets/cloth/Denim.py
R100	release/scripts/presets/cloth/leather.py	release/scripts/presets/cloth/Leather.py
R100	release/scripts/presets/cloth/rubber.py	release/scripts/presets/cloth/Rubber.py
R100	release/scripts/presets/cloth/silk.py	release/scripts/presets/cloth/Silk.py
R100	release/scripts/presets/cycles/integrator/direct_light.py	release/scripts/presets/cycles/integrator/Direct_Light.py
R100	release/scripts/presets/cycles/integrator/full_global_illumination.py	release/scripts/presets/cycles/integrator/Full_Global_Illumination.py
R100	release/scripts/presets/cycles/integrator/limited_global_illumination.py	release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py
R100	release/scripts/presets/cycles/sampling/final.py	release/scripts/presets/cycles/sampling/Final.py
R100	release/scripts/presets/cycles/sampling/preview.py	release/scripts/presets/cycles/sampling/Preview.py
R100	release/scripts/presets/ffmpeg/h264_in_MP4.py	release/scripts/presets/ffmpeg/H264_in_MP4.py
R100	release/scripts/presets/ffmpeg/h264_in_Matroska.py	release/scripts/presets/ffmpeg/H264_in_Matroska.py
R100	release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py	release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py
R100	release/scripts/presets/ffmpeg/ogg_theora.py	release/scripts/presets/ffmpeg/Ogg_Theora.py
R100	release/scripts/presets/ffmpeg/xvid.py	release/scripts/presets/ffmpeg/Xvid.py
R100	release/scripts/presets/fluid/honey.py	release/scripts/presets/fluid/Honey.py
R100	release/scripts/presets/fluid/oil.py	release/scripts/presets/fluid/Oil.py
R100	release/scripts/presets/fluid/water.py	release/scripts/presets/fluid/Water.py
R100	release/scripts/presets/gpencil_material/fill_only.py	release/scripts/presets/gpencil_material/Fill_Only.py
R100	release/scripts/presets/gpencil_material/stroke_only.py	release/scripts/presets/gpencil_material/Stroke_Only.py
R100	release/scripts/presets/gpencil_material/stroke_and_fill.py	release/scripts/presets/gpencil_material/Stroke_and_Fill.py
R100	release/scripts/presets/hair_dynamics/default.py	release/scripts/presets/hair_dynamics/Default.py
R100	release/scripts/presets/interface_theme/blender_dark.xml	release/scripts/presets/interface_theme/Blender_Dark.xml
R100	release/scripts/presets/interface_theme/blender_light.xml	release/scripts/presets/interface_theme/Blender_Light.xml
R100	release/scripts/presets/keyconfig/blender.py	release/scripts/presets/keyconfig/Blender.py
R100	release/scripts/presets/keyconfig/blender_27x.py	release/scripts/presets/keyconfig/Blender_27x.py
R100	release/scripts/presets/keyconfig/industry_compatible.py	release/scripts/presets/keyconfig/Industry_Compatible.py
R100	release/scripts/presets/render/4k_UHDTV_2160p.py	release/scripts/presets/render/4K_UHDTV_2160p.py
R100	release/scripts/presets/tracking_settings/blurry_footage.py	release/scripts/presets/tracking_settings/Blurry_Footage.py
R100	release/scripts/presets/tracking_settings/default.py	release/scripts/presets/tracking_settings/Default.py
R100	release/scripts/presets/tracking_settings/fast_motion.py	release/scripts/presets/tracking_settings/Fast_Motion.py
R100	release/scripts/presets/tracking_settings/planar.py	release/scripts/presets/tracking_settings/Planar.py
R100	release/scripts/presets/tracking_track_color/default.py	release/scripts/presets/tracking_track_color/Default.py
R100	release/scripts/presets/tracking_track_color/far_plane.py	release/scripts/presets/tracking_track_color/Far_Plane.py
R100	release/scripts/presets/tracking_track_color/near_plane.py	release/scripts/presets/tracking_track_color/Near_Plane.py
R100	release/scripts/presets/tracking_track_color/object.py	release/scripts/presets/tracking_track_color/Object.py
M	source/blender/makesdna/DNA_windowmanager_types.h

===================================================================

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
similarity index 100%
rename from release/scripts/presets/cloth/cotton.py
rename to release/scripts/presets/cloth/Cotton.py
diff --git a/release/scripts/presets/cloth/denim.py b/release/scripts/presets/cloth/Denim.py
similarity index 100%
rename from release/scripts/presets/cloth/denim.py
rename to release/scripts/presets/cloth/Denim.py
diff --git a/release/scripts/presets/cloth/leather.py b/release/scripts/presets/cloth/Leather.py
similarity index 100%
rename from release/scripts/presets/cloth/leather.py
rename to release/scripts/presets/cloth/Leather.py
diff --git a/release/scripts/presets/cloth/rubber.py b/release/scripts/presets/cloth/Rubber.py
similarity index 100%
rename from release/scripts/presets/cloth/rubber.py
rename to release/scripts/presets/cloth/Rubber.py
diff --git a/release/scripts/presets/cloth/silk.py b/release/scripts/presets/cloth/Silk.py
similarity index 100%
rename from release/scripts/presets/cloth/silk.py
rename to 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
similarity index 100%
rename from release/scripts/presets/cycles/integrator/direct_light.py
rename to 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
similarity index 100%
rename from release/scripts/presets/cycles/integrator/full_global_illumination.py
rename to 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
similarity index 100%
rename from release/scripts/presets/cycles/integrator/limited_global_illumination.py
rename to 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
similarity index 100%
rename from release/scripts/presets/cycles/sampling/final.py
rename to 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
similarity index 100%
rename from release/scripts/presets/cycles/sampling/preview.py
rename to 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
similarity index 100%
rename from release/scripts/presets/ffmpeg/h264_in_MP4.py
rename to 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
similarity index 100%
rename from release/scripts/presets/ffmpeg/h264_in_Matroska.py
rename to 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
similarity index 100%
rename from release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py
rename to 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
similarity index 100%
rename from release/scripts/presets/ffmpeg/ogg_theora.py
rename to release/scripts/presets/ffmpeg/Ogg_Theora.py
diff --git a/release/scripts/presets/ffmpeg/xvid.py b/release/scripts/presets/ffmpeg/Xvid.py
similarity index 100%
rename from release/scripts/presets/ffmpeg/xvid.py
rename to release/scripts/presets/ffmpeg/Xvid.py
diff --git a/release/scripts/presets/fluid/honey.py b/release/scripts/presets/fluid/Honey.py
similarity index 100%
rename from release/scripts/presets/fluid/honey.py
rename to release/scripts/presets/fluid/Honey.py
diff --git a/release/scripts/presets/fluid/oil.py b/release/scripts/presets/fluid/Oil.py
similarity index 100%
rename from release/scripts/presets/fluid/oil.py
rename to release/scripts/presets/fluid/Oil.py
diff --git a/release/scripts/presets/fluid/water.py b/release/scripts/presets/fluid/Water.py
similarity index 100%
rename from release/scripts/presets/fluid/water.py
rename to 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
similarity index 100%
rename from release/scripts/presets/gpencil_material/fill_only.py
rename to 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
similarity index 100%
rename from release/scripts/presets/gpencil_material/stroke_only.py
rename to 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
similarity index 100%
rename from release/scripts/presets/gpencil_material/stroke_and_fill.py
rename to 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
similarity index 100%
rename from release/scripts/presets/hair_dynamics/default.py
rename to 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
similarity index 100%
rename from release/scripts/presets/interface_theme/blender_dark.xml
rename to 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
similarity index 100%
rename from release/scripts/presets/interface_theme/blender_light.xml
rename to release/scripts/presets/interface_theme/Blender_Light.xml
diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/Blender.py
similarity index 100%
rename from release/scripts/presets/keyconfig/blender.py
rename to release/scripts/presets/keyconfig/Blender.py
diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/Blender_27x.py
similarity index 100%
rename from release/scripts/presets/keyconfig/blender_27x.py
rename to 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
similarity index 100%
rename from release/scripts/presets/keyconfig/industry_compatible.py
rename to 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
similarity index 100%
rename from release/scripts/presets/render/4k_UHDTV_2160p.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_settings/blurry_footage.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_settings/default.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_settings/fast_motion.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_settings/planar.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_track_color/default.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_track_color/far_plane.py
rename to 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
similarity index 100%
rename from release/scripts/presets/tracking_track_color/near_plane.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list