From 01d49d1542cee0da2a7629443f9534bc5cec5a55 Mon Sep 17 00:00:00 2001 From: Nathan Craddock Date: Wed, 3 Feb 2021 16:02:04 -0700 Subject: 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. --- release/datafiles/userdef/userdef_default.c | 2 +- release/scripts/modules/bpy/utils/__init__.py | 2 +- release/scripts/presets/cloth/Cotton.py | 11 + release/scripts/presets/cloth/Denim.py | 11 + release/scripts/presets/cloth/Leather.py | 11 + release/scripts/presets/cloth/Rubber.py | 11 + release/scripts/presets/cloth/Silk.py | 11 + release/scripts/presets/cloth/cotton.py | 11 - release/scripts/presets/cloth/denim.py | 11 - release/scripts/presets/cloth/leather.py | 11 - release/scripts/presets/cloth/rubber.py | 11 - release/scripts/presets/cloth/silk.py | 11 - .../presets/cycles/integrator/Direct_Light.py | 11 + .../cycles/integrator/Full_Global_Illumination.py | 11 + .../integrator/Limited_Global_Illumination.py | 11 + .../presets/cycles/integrator/direct_light.py | 11 - .../cycles/integrator/full_global_illumination.py | 11 - .../integrator/limited_global_illumination.py | 11 - release/scripts/presets/cycles/sampling/Final.py | 18 + release/scripts/presets/cycles/sampling/Preview.py | 18 + release/scripts/presets/cycles/sampling/final.py | 18 - release/scripts/presets/cycles/sampling/preview.py | 18 - release/scripts/presets/ffmpeg/H264_in_MP4.py | 18 + release/scripts/presets/ffmpeg/H264_in_Matroska.py | 17 + .../ffmpeg/H264_in_Matroska_for_scrubbing.py | 14 + release/scripts/presets/ffmpeg/Ogg_Theora.py | 18 + release/scripts/presets/ffmpeg/Xvid.py | 18 + release/scripts/presets/ffmpeg/h264_in_MP4.py | 18 - release/scripts/presets/ffmpeg/h264_in_Matroska.py | 17 - .../ffmpeg/h264_in_Matroska_for_scrubbing.py | 14 - release/scripts/presets/ffmpeg/ogg_theora.py | 18 - release/scripts/presets/ffmpeg/xvid.py | 18 - release/scripts/presets/fluid/Honey.py | 3 + release/scripts/presets/fluid/Oil.py | 3 + release/scripts/presets/fluid/Water.py | 3 + release/scripts/presets/fluid/honey.py | 3 - release/scripts/presets/fluid/oil.py | 3 - release/scripts/presets/fluid/water.py | 3 - .../scripts/presets/gpencil_material/Fill_Only.py | 25 + .../presets/gpencil_material/Stroke_Only.py | 25 + .../presets/gpencil_material/Stroke_and_Fill.py | 25 + .../scripts/presets/gpencil_material/fill_only.py | 25 - .../presets/gpencil_material/stroke_and_fill.py | 25 - .../presets/gpencil_material/stroke_only.py | 25 - release/scripts/presets/hair_dynamics/Default.py | 17 + release/scripts/presets/hair_dynamics/default.py | 17 - .../presets/interface_theme/Blender_Dark.xml | 6 + .../presets/interface_theme/Blender_Light.xml | 1534 ++++++++++++++++++++ .../presets/interface_theme/blender_dark.xml | 6 - .../presets/interface_theme/blender_light.xml | 1534 -------------------- release/scripts/presets/keyconfig/Blender.py | 249 ++++ release/scripts/presets/keyconfig/Blender_27x.py | 103 ++ .../presets/keyconfig/Industry_Compatible.py | 35 + release/scripts/presets/keyconfig/blender.py | 249 ---- release/scripts/presets/keyconfig/blender_27x.py | 103 -- .../presets/keyconfig/industry_compatible.py | 35 - release/scripts/presets/render/4K_UHDTV_2160p.py | 8 + release/scripts/presets/render/4k_UHDTV_2160p.py | 8 - .../presets/tracking_settings/Blurry_Footage.py | 18 + .../scripts/presets/tracking_settings/Default.py | 18 + .../presets/tracking_settings/Fast_Motion.py | 18 + .../scripts/presets/tracking_settings/Planar.py | 18 + .../presets/tracking_settings/blurry_footage.py | 18 - .../scripts/presets/tracking_settings/default.py | 18 - .../presets/tracking_settings/fast_motion.py | 18 - .../scripts/presets/tracking_settings/planar.py | 18 - .../presets/tracking_track_color/Default.py | 5 + .../presets/tracking_track_color/Far_Plane.py | 5 + .../presets/tracking_track_color/Near_Plane.py | 5 + .../scripts/presets/tracking_track_color/Object.py | 5 + .../presets/tracking_track_color/default.py | 5 - .../presets/tracking_track_color/far_plane.py | 5 - .../presets/tracking_track_color/near_plane.py | 5 - .../scripts/presets/tracking_track_color/object.py | 5 - source/blender/makesdna/DNA_windowmanager_types.h | 2 +- 75 files changed, 2340 insertions(+), 2340 deletions(-) create mode 100644 release/scripts/presets/cloth/Cotton.py create mode 100644 release/scripts/presets/cloth/Denim.py create mode 100644 release/scripts/presets/cloth/Leather.py create mode 100644 release/scripts/presets/cloth/Rubber.py create mode 100644 release/scripts/presets/cloth/Silk.py delete mode 100644 release/scripts/presets/cloth/cotton.py delete mode 100644 release/scripts/presets/cloth/denim.py delete mode 100644 release/scripts/presets/cloth/leather.py delete mode 100644 release/scripts/presets/cloth/rubber.py delete mode 100644 release/scripts/presets/cloth/silk.py create mode 100644 release/scripts/presets/cycles/integrator/Direct_Light.py create mode 100644 release/scripts/presets/cycles/integrator/Full_Global_Illumination.py create mode 100644 release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py delete mode 100644 release/scripts/presets/cycles/integrator/direct_light.py delete mode 100644 release/scripts/presets/cycles/integrator/full_global_illumination.py delete mode 100644 release/scripts/presets/cycles/integrator/limited_global_illumination.py create mode 100644 release/scripts/presets/cycles/sampling/Final.py create mode 100644 release/scripts/presets/cycles/sampling/Preview.py delete mode 100644 release/scripts/presets/cycles/sampling/final.py delete mode 100644 release/scripts/presets/cycles/sampling/preview.py create mode 100644 release/scripts/presets/ffmpeg/H264_in_MP4.py create mode 100644 release/scripts/presets/ffmpeg/H264_in_Matroska.py create mode 100644 release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py create mode 100644 release/scripts/presets/ffmpeg/Ogg_Theora.py create mode 100644 release/scripts/presets/ffmpeg/Xvid.py delete mode 100644 release/scripts/presets/ffmpeg/h264_in_MP4.py delete mode 100644 release/scripts/presets/ffmpeg/h264_in_Matroska.py delete mode 100644 release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py delete mode 100644 release/scripts/presets/ffmpeg/ogg_theora.py delete mode 100644 release/scripts/presets/ffmpeg/xvid.py create mode 100644 release/scripts/presets/fluid/Honey.py create mode 100644 release/scripts/presets/fluid/Oil.py create mode 100644 release/scripts/presets/fluid/Water.py delete mode 100644 release/scripts/presets/fluid/honey.py delete mode 100644 release/scripts/presets/fluid/oil.py delete mode 100644 release/scripts/presets/fluid/water.py create mode 100644 release/scripts/presets/gpencil_material/Fill_Only.py create mode 100644 release/scripts/presets/gpencil_material/Stroke_Only.py create mode 100644 release/scripts/presets/gpencil_material/Stroke_and_Fill.py delete mode 100644 release/scripts/presets/gpencil_material/fill_only.py delete mode 100644 release/scripts/presets/gpencil_material/stroke_and_fill.py delete mode 100644 release/scripts/presets/gpencil_material/stroke_only.py create mode 100644 release/scripts/presets/hair_dynamics/Default.py delete mode 100644 release/scripts/presets/hair_dynamics/default.py create mode 100644 release/scripts/presets/interface_theme/Blender_Dark.xml create mode 100644 release/scripts/presets/interface_theme/Blender_Light.xml delete mode 100644 release/scripts/presets/interface_theme/blender_dark.xml delete mode 100644 release/scripts/presets/interface_theme/blender_light.xml create mode 100644 release/scripts/presets/keyconfig/Blender.py create mode 100644 release/scripts/presets/keyconfig/Blender_27x.py create mode 100644 release/scripts/presets/keyconfig/Industry_Compatible.py delete mode 100644 release/scripts/presets/keyconfig/blender.py delete mode 100644 release/scripts/presets/keyconfig/blender_27x.py delete mode 100644 release/scripts/presets/keyconfig/industry_compatible.py create mode 100644 release/scripts/presets/render/4K_UHDTV_2160p.py delete mode 100644 release/scripts/presets/render/4k_UHDTV_2160p.py create mode 100644 release/scripts/presets/tracking_settings/Blurry_Footage.py create mode 100644 release/scripts/presets/tracking_settings/Default.py create mode 100644 release/scripts/presets/tracking_settings/Fast_Motion.py create mode 100644 release/scripts/presets/tracking_settings/Planar.py delete mode 100644 release/scripts/presets/tracking_settings/blurry_footage.py delete mode 100644 release/scripts/presets/tracking_settings/default.py delete mode 100644 release/scripts/presets/tracking_settings/fast_motion.py delete mode 100644 release/scripts/presets/tracking_settings/planar.py create mode 100644 release/scripts/presets/tracking_track_color/Default.py create mode 100644 release/scripts/presets/tracking_track_color/Far_Plane.py create mode 100644 release/scripts/presets/tracking_track_color/Near_Plane.py create mode 100644 release/scripts/presets/tracking_track_color/Object.py delete mode 100644 release/scripts/presets/tracking_track_color/default.py delete mode 100644 release/scripts/presets/tracking_track_color/far_plane.py delete mode 100644 release/scripts/presets/tracking_track_color/near_plane.py delete mode 100644 release/scripts/presets/tracking_track_color/object.py 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 new file mode 100644 index 00000000000..9e766416a75 --- /dev/null +++ b/release/scripts/presets/cloth/Cotton.py @@ -0,0 +1,11 @@ +import bpy +bpy.context.cloth.settings.quality = 5 +bpy.context.cloth.settings.mass = 0.300 +bpy.context.cloth.settings.tension_stiffness = 15 +bpy.context.cloth.settings.compression_stiffness = 15 +bpy.context.cloth.settings.shear_stiffness = 15 +bpy.context.cloth.settings.bending_stiffness = 0.500 +bpy.context.cloth.settings.tension_damping = 5 +bpy.context.cloth.settings.compression_damping = 5 +bpy.context.cloth.settings.shear_damping = 5 +bpy.context.cloth.settings.air_damping = 1.000 diff --git a/release/scripts/presets/cloth/Denim.py b/release/scripts/presets/cloth/Denim.py new file mode 100644 index 00000000000..7abf4469709 --- /dev/null +++ b/release/scripts/presets/cloth/Denim.py @@ -0,0 +1,11 @@ +import bpy +bpy.context.cloth.settings.quality = 12 +bpy.context.cloth.settings.mass = 1 +bpy.context.cloth.settings.tension_stiffness = 40 +bpy.context.cloth.settings.compression_stiffness = 40 +bpy.context.cloth.settings.shear_stiffness = 40 +bpy.context.cloth.settings.bending_stiffness = 10 +bpy.context.cloth.settings.tension_damping = 25 +bpy.context.cloth.settings.compression_damping = 25 +bpy.context.cloth.settings.shear_damping = 25 +bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/Leather.py b/release/scripts/presets/cloth/Leather.py new file mode 100644 index 00000000000..8ba9ff7dabe --- /dev/null +++ b/release/scripts/presets/cloth/Leather.py @@ -0,0 +1,11 @@ +import bpy +bpy.context.cloth.settings.quality = 15 +bpy.context.cloth.settings.mass = 0.4 +bpy.context.cloth.settings.tension_stiffness = 80 +bpy.context.cloth.settings.compression_stiffness = 80 +bpy.context.cloth.settings.shear_stiffness = 80 +bpy.context.cloth.settings.bending_stiffness = 150 +bpy.context.cloth.settings.tension_damping = 25 +bpy.context.cloth.settings.compression_damping = 25 +bpy.context.cloth.settings.shear_damping = 25 +bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/Rubber.py b/release/scripts/presets/cloth/Rubber.py new file mode 100644 index 00000000000..0d791fab2a9 --- /dev/null +++ b/release/scripts/presets/cloth/Rubber.py @@ -0,0 +1,11 @@ +import bpy +bpy.context.cloth.settings.quality = 7 +bpy.context.cloth.settings.mass = 3 +bpy.context.cloth.settings.tension_stiffness = 15 +bpy.context.cloth.settings.compression_stiffness = 15 +bpy.context.cloth.settings.shear_stiffness = 15 +bpy.context.cloth.settings.bending_stiffness = 25 +bpy.context.cloth.settings.tension_damping = 25 +bpy.context.cloth.settings.compression_damping = 25 +bpy.context.cloth.settings.shear_damping = 25 +bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/Silk.py b/release/scripts/presets/cloth/Silk.py new file mode 100644 index 00000000000..af867cf9c60 --- /dev/null +++ b/release/scripts/presets/cloth/Silk.py @@ -0,0 +1,11 @@ +import bpy +bpy.context.cloth.settings.quality = 5 +bpy.context.cloth.settings.mass = 0.150 +bpy.context.cloth.settings.tension_stiffness = 5 +bpy.context.cloth.settings.compression_stiffness = 5 +bpy.context.cloth.settings.shear_stiffness = 5 +bpy.context.cloth.settings.bending_stiffness = 0.05 +bpy.context.cloth.settings.tension_damping = 0 +bpy.context.cloth.settings.compression_damping = 0 +bpy.context.cloth.settings.shear_damping = 0 +bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/cotton.py b/release/scripts/presets/cloth/cotton.py deleted file mode 100644 index 9e766416a75..00000000000 --- a/release/scripts/presets/cloth/cotton.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -bpy.context.cloth.settings.quality = 5 -bpy.context.cloth.settings.mass = 0.300 -bpy.context.cloth.settings.tension_stiffness = 15 -bpy.context.cloth.settings.compression_stiffness = 15 -bpy.context.cloth.settings.shear_stiffness = 15 -bpy.context.cloth.settings.bending_stiffness = 0.500 -bpy.context.cloth.settings.tension_damping = 5 -bpy.context.cloth.settings.compression_damping = 5 -bpy.context.cloth.settings.shear_damping = 5 -bpy.context.cloth.settings.air_damping = 1.000 diff --git a/release/scripts/presets/cloth/denim.py b/release/scripts/presets/cloth/denim.py deleted file mode 100644 index 7abf4469709..00000000000 --- a/release/scripts/presets/cloth/denim.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -bpy.context.cloth.settings.quality = 12 -bpy.context.cloth.settings.mass = 1 -bpy.context.cloth.settings.tension_stiffness = 40 -bpy.context.cloth.settings.compression_stiffness = 40 -bpy.context.cloth.settings.shear_stiffness = 40 -bpy.context.cloth.settings.bending_stiffness = 10 -bpy.context.cloth.settings.tension_damping = 25 -bpy.context.cloth.settings.compression_damping = 25 -bpy.context.cloth.settings.shear_damping = 25 -bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/leather.py b/release/scripts/presets/cloth/leather.py deleted file mode 100644 index 8ba9ff7dabe..00000000000 --- a/release/scripts/presets/cloth/leather.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -bpy.context.cloth.settings.quality = 15 -bpy.context.cloth.settings.mass = 0.4 -bpy.context.cloth.settings.tension_stiffness = 80 -bpy.context.cloth.settings.compression_stiffness = 80 -bpy.context.cloth.settings.shear_stiffness = 80 -bpy.context.cloth.settings.bending_stiffness = 150 -bpy.context.cloth.settings.tension_damping = 25 -bpy.context.cloth.settings.compression_damping = 25 -bpy.context.cloth.settings.shear_damping = 25 -bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/rubber.py b/release/scripts/presets/cloth/rubber.py deleted file mode 100644 index 0d791fab2a9..00000000000 --- a/release/scripts/presets/cloth/rubber.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -bpy.context.cloth.settings.quality = 7 -bpy.context.cloth.settings.mass = 3 -bpy.context.cloth.settings.tension_stiffness = 15 -bpy.context.cloth.settings.compression_stiffness = 15 -bpy.context.cloth.settings.shear_stiffness = 15 -bpy.context.cloth.settings.bending_stiffness = 25 -bpy.context.cloth.settings.tension_damping = 25 -bpy.context.cloth.settings.compression_damping = 25 -bpy.context.cloth.settings.shear_damping = 25 -bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cloth/silk.py b/release/scripts/presets/cloth/silk.py deleted file mode 100644 index af867cf9c60..00000000000 --- a/release/scripts/presets/cloth/silk.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -bpy.context.cloth.settings.quality = 5 -bpy.context.cloth.settings.mass = 0.150 -bpy.context.cloth.settings.tension_stiffness = 5 -bpy.context.cloth.settings.compression_stiffness = 5 -bpy.context.cloth.settings.shear_stiffness = 5 -bpy.context.cloth.settings.bending_stiffness = 0.05 -bpy.context.cloth.settings.tension_damping = 0 -bpy.context.cloth.settings.compression_damping = 0 -bpy.context.cloth.settings.shear_damping = 0 -bpy.context.cloth.settings.air_damping = 1 diff --git a/release/scripts/presets/cycles/integrator/Direct_Light.py b/release/scripts/presets/cycles/integrator/Direct_Light.py new file mode 100644 index 00000000000..701aa10d556 --- /dev/null +++ b/release/scripts/presets/cycles/integrator/Direct_Light.py @@ -0,0 +1,11 @@ +import bpy +cycles = bpy.context.scene.cycles + +cycles.max_bounces = 8 +cycles.caustics_reflective = False +cycles.caustics_refractive = False +cycles.diffuse_bounces = 0 +cycles.glossy_bounces = 1 +cycles.transmission_bounces = 2 +cycles.volume_bounces = 0 +cycles.transparent_max_bounces = 8 diff --git a/release/scripts/presets/cycles/integrator/Full_Global_Illumination.py b/release/scripts/presets/cycles/integrator/Full_Global_Illumination.py new file mode 100644 index 00000000000..a03c6c8bd64 --- /dev/null +++ b/release/scripts/presets/cycles/integrator/Full_Global_Illumination.py @@ -0,0 +1,11 @@ +import bpy +cycles = bpy.context.scene.cycles + +cycles.max_bounces = 128 +cycles.caustics_reflective = True +cycles.caustics_refractive = True +cycles.diffuse_bounces = 128 +cycles.glossy_bounces = 128 +cycles.transmission_bounces = 128 +cycles.volume_bounces = 128 +cycles.transparent_max_bounces = 128 diff --git a/release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py b/release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py new file mode 100644 index 00000000000..d37bf46c705 --- /dev/null +++ b/release/scripts/presets/cycles/integrator/Limited_Global_Illumination.py @@ -0,0 +1,11 @@ +import bpy +cycles = bpy.context.scene.cycles + +cycles.max_bounces = 8 +cycles.caustics_reflective = False +cycles.caustics_refractive = False +cycles.diffuse_bounces = 1 +cycles.glossy_bounces = 4 +cycles.transmission_bounces = 8 +cycles.volume_bounces = 2 +cycles.transparent_max_bounces = 8 diff --git a/release/scripts/presets/cycles/integrator/direct_light.py b/release/scripts/presets/cycles/integrator/direct_light.py deleted file mode 100644 index 701aa10d556..00000000000 --- a/release/scripts/presets/cycles/integrator/direct_light.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -cycles = bpy.context.scene.cycles - -cycles.max_bounces = 8 -cycles.caustics_reflective = False -cycles.caustics_refractive = False -cycles.diffuse_bounces = 0 -cycles.glossy_bounces = 1 -cycles.transmission_bounces = 2 -cycles.volume_bounces = 0 -cycles.transparent_max_bounces = 8 diff --git a/release/scripts/presets/cycles/integrator/full_global_illumination.py b/release/scripts/presets/cycles/integrator/full_global_illumination.py deleted file mode 100644 index a03c6c8bd64..00000000000 --- a/release/scripts/presets/cycles/integrator/full_global_illumination.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -cycles = bpy.context.scene.cycles - -cycles.max_bounces = 128 -cycles.caustics_reflective = True -cycles.caustics_refractive = True -cycles.diffuse_bounces = 128 -cycles.glossy_bounces = 128 -cycles.transmission_bounces = 128 -cycles.volume_bounces = 128 -cycles.transparent_max_bounces = 128 diff --git a/release/scripts/presets/cycles/integrator/limited_global_illumination.py b/release/scripts/presets/cycles/integrator/limited_global_illumination.py deleted file mode 100644 index d37bf46c705..00000000000 --- a/release/scripts/presets/cycles/integrator/limited_global_illumination.py +++ /dev/null @@ -1,11 +0,0 @@ -import bpy -cycles = bpy.context.scene.cycles - -cycles.max_bounces = 8 -cycles.caustics_reflective = False -cycles.caustics_refractive = False -cycles.diffuse_bounces = 1 -cycles.glossy_bounces = 4 -cycles.transmission_bounces = 8 -cycles.volume_bounces = 2 -cycles.transparent_max_bounces = 8 diff --git a/release/scripts/presets/cycles/sampling/Final.py b/release/scripts/presets/cycles/sampling/Final.py new file mode 100644 index 00000000000..f1222d927c1 --- /dev/null +++ b/release/scripts/presets/cycles/sampling/Final.py @@ -0,0 +1,18 @@ +import bpy +cycles = bpy.context.scene.cycles + +# Path Trace +cycles.samples = 512 +cycles.preview_samples = 128 + +# Branched Path Trace +cycles.aa_samples = 128 +cycles.preview_aa_samples = 32 + +cycles.diffuse_samples = 4 +cycles.glossy_samples = 4 +cycles.transmission_samples = 4 +cycles.ao_samples = 1 +cycles.mesh_light_samples = 4 +cycles.subsurface_samples = 4 +cycles.volume_samples = 4 diff --git a/release/scripts/presets/cycles/sampling/Preview.py b/release/scripts/presets/cycles/sampling/Preview.py new file mode 100644 index 00000000000..c16449e2c8f --- /dev/null +++ b/release/scripts/presets/cycles/sampling/Preview.py @@ -0,0 +1,18 @@ +import bpy +cycles = bpy.context.scene.cycles + +# Path Trace +cycles.samples = 128 +cycles.preview_samples = 32 + +# Branched Path Trace +cycles.aa_samples = 32 +cycles.preview_aa_samples = 4 + +cycles.diffuse_samples = 4 +cycles.glossy_samples = 4 +cycles.transmission_samples = 4 +cycles.ao_samples = 1 +cycles.mesh_light_samples = 4 +cycles.subsurface_samples = 4 +cycles.volume_samples = 4 diff --git a/release/scripts/presets/cycles/sampling/final.py b/release/scripts/presets/cycles/sampling/final.py deleted file mode 100644 index f1222d927c1..00000000000 --- a/release/scripts/presets/cycles/sampling/final.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -cycles = bpy.context.scene.cycles - -# Path Trace -cycles.samples = 512 -cycles.preview_samples = 128 - -# Branched Path Trace -cycles.aa_samples = 128 -cycles.preview_aa_samples = 32 - -cycles.diffuse_samples = 4 -cycles.glossy_samples = 4 -cycles.transmission_samples = 4 -cycles.ao_samples = 1 -cycles.mesh_light_samples = 4 -cycles.subsurface_samples = 4 -cycles.volume_samples = 4 diff --git a/release/scripts/presets/cycles/sampling/preview.py b/release/scripts/presets/cycles/sampling/preview.py deleted file mode 100644 index c16449e2c8f..00000000000 --- a/release/scripts/presets/cycles/sampling/preview.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -cycles = bpy.context.scene.cycles - -# Path Trace -cycles.samples = 128 -cycles.preview_samples = 32 - -# Branched Path Trace -cycles.aa_samples = 32 -cycles.preview_aa_samples = 4 - -cycles.diffuse_samples = 4 -cycles.glossy_samples = 4 -cycles.transmission_samples = 4 -cycles.ao_samples = 1 -cycles.mesh_light_samples = 4 -cycles.subsurface_samples = 4 -cycles.volume_samples = 4 diff --git a/release/scripts/presets/ffmpeg/H264_in_MP4.py b/release/scripts/presets/ffmpeg/H264_in_MP4.py new file mode 100644 index 00000000000..0e9c32c4878 --- /dev/null +++ b/release/scripts/presets/ffmpeg/H264_in_MP4.py @@ -0,0 +1,18 @@ +import bpy +is_ntsc = (bpy.context.scene.render.fps != 25) + +bpy.context.scene.render.ffmpeg.format = "MPEG4" +bpy.context.scene.render.ffmpeg.codec = "H264" + +if is_ntsc: + bpy.context.scene.render.ffmpeg.gopsize = 18 +else: + bpy.context.scene.render.ffmpeg.gopsize = 15 +bpy.context.scene.render.ffmpeg.use_max_b_frames = False + +bpy.context.scene.render.ffmpeg.video_bitrate = 6000 +bpy.context.scene.render.ffmpeg.maxrate = 9000 +bpy.context.scene.render.ffmpeg.minrate = 0 +bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 +bpy.context.scene.render.ffmpeg.packetsize = 2048 +bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/H264_in_Matroska.py b/release/scripts/presets/ffmpeg/H264_in_Matroska.py new file mode 100644 index 00000000000..1fe066dc4bf --- /dev/null +++ b/release/scripts/presets/ffmpeg/H264_in_Matroska.py @@ -0,0 +1,17 @@ +import bpy +is_ntsc = (bpy.context.scene.render.fps != 25) + +bpy.context.scene.render.ffmpeg.format = "MKV" +bpy.context.scene.render.ffmpeg.codec = "H264" + +if is_ntsc: + bpy.context.scene.render.ffmpeg.gopsize = 18 +else: + bpy.context.scene.render.ffmpeg.gopsize = 15 + +bpy.context.scene.render.ffmpeg.video_bitrate = 6000 +bpy.context.scene.render.ffmpeg.maxrate = 9000 +bpy.context.scene.render.ffmpeg.minrate = 0 +bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 +bpy.context.scene.render.ffmpeg.packetsize = 2048 +bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py b/release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py new file mode 100644 index 00000000000..eb1889d272f --- /dev/null +++ b/release/scripts/presets/ffmpeg/H264_in_Matroska_for_scrubbing.py @@ -0,0 +1,14 @@ +"""Sets up FFmpeg to output files that can easily be scrubbed through. + +Information was taken from https://trac.ffmpeg.org/wiki/Encode/VFX#H.264 +""" + +import bpy + +bpy.context.scene.render.ffmpeg.format = "MKV" +bpy.context.scene.render.ffmpeg.codec = "H264" + +bpy.context.scene.render.ffmpeg.gopsize = 1 +bpy.context.scene.render.ffmpeg.constant_rate_factor = 'PERC_LOSSLESS' +bpy.context.scene.render.ffmpeg.use_max_b_frames = True +bpy.context.scene.render.ffmpeg.max_b_frames = 0 diff --git a/release/scripts/presets/ffmpeg/Ogg_Theora.py b/release/scripts/presets/ffmpeg/Ogg_Theora.py new file mode 100644 index 00000000000..b450b67fd98 --- /dev/null +++ b/release/scripts/presets/ffmpeg/Ogg_Theora.py @@ -0,0 +1,18 @@ +import bpy +is_ntsc = (bpy.context.scene.render.fps != 25) + +bpy.context.scene.render.ffmpeg.format = "OGG" +bpy.context.scene.render.ffmpeg.codec = "THEORA" + +if is_ntsc: + bpy.context.scene.render.ffmpeg.gopsize = 18 +else: + bpy.context.scene.render.ffmpeg.gopsize = 15 +bpy.context.scene.render.ffmpeg.use_max_b_frames = False + +bpy.context.scene.render.ffmpeg.video_bitrate = 6000 +bpy.context.scene.render.ffmpeg.maxrate = 9000 +bpy.context.scene.render.ffmpeg.minrate = 0 +bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 +bpy.context.scene.render.ffmpeg.packetsize = 2048 +bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/Xvid.py b/release/scripts/presets/ffmpeg/Xvid.py new file mode 100644 index 00000000000..dba0f71c279 --- /dev/null +++ b/release/scripts/presets/ffmpeg/Xvid.py @@ -0,0 +1,18 @@ +import bpy +is_ntsc = (bpy.context.scene.render.fps != 25) + +bpy.context.scene.render.ffmpeg.format = "AVI" +bpy.context.scene.render.ffmpeg.codec = "MPEG4" + +if is_ntsc: + bpy.context.scene.render.ffmpeg.gopsize = 18 +else: + bpy.context.scene.render.ffmpeg.gopsize = 15 +bpy.context.scene.render.ffmpeg.use_max_b_frames = False + +bpy.context.scene.render.ffmpeg.video_bitrate = 6000 +bpy.context.scene.render.ffmpeg.maxrate = 9000 +bpy.context.scene.render.ffmpeg.minrate = 0 +bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 +bpy.context.scene.render.ffmpeg.packetsize = 2048 +bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/h264_in_MP4.py b/release/scripts/presets/ffmpeg/h264_in_MP4.py deleted file mode 100644 index 0e9c32c4878..00000000000 --- a/release/scripts/presets/ffmpeg/h264_in_MP4.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -is_ntsc = (bpy.context.scene.render.fps != 25) - -bpy.context.scene.render.ffmpeg.format = "MPEG4" -bpy.context.scene.render.ffmpeg.codec = "H264" - -if is_ntsc: - bpy.context.scene.render.ffmpeg.gopsize = 18 -else: - bpy.context.scene.render.ffmpeg.gopsize = 15 -bpy.context.scene.render.ffmpeg.use_max_b_frames = False - -bpy.context.scene.render.ffmpeg.video_bitrate = 6000 -bpy.context.scene.render.ffmpeg.maxrate = 9000 -bpy.context.scene.render.ffmpeg.minrate = 0 -bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 -bpy.context.scene.render.ffmpeg.packetsize = 2048 -bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/h264_in_Matroska.py b/release/scripts/presets/ffmpeg/h264_in_Matroska.py deleted file mode 100644 index 1fe066dc4bf..00000000000 --- a/release/scripts/presets/ffmpeg/h264_in_Matroska.py +++ /dev/null @@ -1,17 +0,0 @@ -import bpy -is_ntsc = (bpy.context.scene.render.fps != 25) - -bpy.context.scene.render.ffmpeg.format = "MKV" -bpy.context.scene.render.ffmpeg.codec = "H264" - -if is_ntsc: - bpy.context.scene.render.ffmpeg.gopsize = 18 -else: - bpy.context.scene.render.ffmpeg.gopsize = 15 - -bpy.context.scene.render.ffmpeg.video_bitrate = 6000 -bpy.context.scene.render.ffmpeg.maxrate = 9000 -bpy.context.scene.render.ffmpeg.minrate = 0 -bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 -bpy.context.scene.render.ffmpeg.packetsize = 2048 -bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py b/release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py deleted file mode 100644 index eb1889d272f..00000000000 --- a/release/scripts/presets/ffmpeg/h264_in_Matroska_for_scrubbing.py +++ /dev/null @@ -1,14 +0,0 @@ -"""Sets up FFmpeg to output files that can easily be scrubbed through. - -Information was taken from https://trac.ffmpeg.org/wiki/Encode/VFX#H.264 -""" - -import bpy - -bpy.context.scene.render.ffmpeg.format = "MKV" -bpy.context.scene.render.ffmpeg.codec = "H264" - -bpy.context.scene.render.ffmpeg.gopsize = 1 -bpy.context.scene.render.ffmpeg.constant_rate_factor = 'PERC_LOSSLESS' -bpy.context.scene.render.ffmpeg.use_max_b_frames = True -bpy.context.scene.render.ffmpeg.max_b_frames = 0 diff --git a/release/scripts/presets/ffmpeg/ogg_theora.py b/release/scripts/presets/ffmpeg/ogg_theora.py deleted file mode 100644 index b450b67fd98..00000000000 --- a/release/scripts/presets/ffmpeg/ogg_theora.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -is_ntsc = (bpy.context.scene.render.fps != 25) - -bpy.context.scene.render.ffmpeg.format = "OGG" -bpy.context.scene.render.ffmpeg.codec = "THEORA" - -if is_ntsc: - bpy.context.scene.render.ffmpeg.gopsize = 18 -else: - bpy.context.scene.render.ffmpeg.gopsize = 15 -bpy.context.scene.render.ffmpeg.use_max_b_frames = False - -bpy.context.scene.render.ffmpeg.video_bitrate = 6000 -bpy.context.scene.render.ffmpeg.maxrate = 9000 -bpy.context.scene.render.ffmpeg.minrate = 0 -bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 -bpy.context.scene.render.ffmpeg.packetsize = 2048 -bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/ffmpeg/xvid.py b/release/scripts/presets/ffmpeg/xvid.py deleted file mode 100644 index dba0f71c279..00000000000 --- a/release/scripts/presets/ffmpeg/xvid.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -is_ntsc = (bpy.context.scene.render.fps != 25) - -bpy.context.scene.render.ffmpeg.format = "AVI" -bpy.context.scene.render.ffmpeg.codec = "MPEG4" - -if is_ntsc: - bpy.context.scene.render.ffmpeg.gopsize = 18 -else: - bpy.context.scene.render.ffmpeg.gopsize = 15 -bpy.context.scene.render.ffmpeg.use_max_b_frames = False - -bpy.context.scene.render.ffmpeg.video_bitrate = 6000 -bpy.context.scene.render.ffmpeg.maxrate = 9000 -bpy.context.scene.render.ffmpeg.minrate = 0 -bpy.context.scene.render.ffmpeg.buffersize = 224 * 8 -bpy.context.scene.render.ffmpeg.packetsize = 2048 -bpy.context.scene.render.ffmpeg.muxrate = 10080000 diff --git a/release/scripts/presets/fluid/Honey.py b/release/scripts/presets/fluid/Honey.py new file mode 100644 index 00000000000..0ed3658470a --- /dev/null +++ b/release/scripts/presets/fluid/Honey.py @@ -0,0 +1,3 @@ +import bpy +bpy.context.fluid.domain_settings.viscosity_base = 2.0 +bpy.context.fluid.domain_settings.viscosity_exponent = 3 diff --git a/release/scripts/presets/fluid/Oil.py b/release/scripts/presets/fluid/Oil.py new file mode 100644 index 00000000000..c33e5d4b6cf --- /dev/null +++ b/release/scripts/presets/fluid/Oil.py @@ -0,0 +1,3 @@ +import bpy +bpy.context.fluid.domain_settings.viscosity_base = 5.0 +bpy.context.fluid.domain_settings.viscosity_exponent = 5 diff --git a/release/scripts/presets/fluid/Water.py b/release/scripts/presets/fluid/Water.py new file mode 100644 index 00000000000..f34ecc834ff --- /dev/null +++ b/release/scripts/presets/fluid/Water.py @@ -0,0 +1,3 @@ +import bpy +bpy.context.fluid.domain_settings.viscosity_base = 1.0 +bpy.context.fluid.domain_settings.viscosity_exponent = 6 diff --git a/release/scripts/presets/fluid/honey.py b/release/scripts/presets/fluid/honey.py deleted file mode 100644 index 0ed3658470a..00000000000 --- a/release/scripts/presets/fluid/honey.py +++ /dev/null @@ -1,3 +0,0 @@ -import bpy -bpy.context.fluid.domain_settings.viscosity_base = 2.0 -bpy.context.fluid.domain_settings.viscosity_exponent = 3 diff --git a/release/scripts/presets/fluid/oil.py b/release/scripts/presets/fluid/oil.py deleted file mode 100644 index c33e5d4b6cf..00000000000 --- a/release/scripts/presets/fluid/oil.py +++ /dev/null @@ -1,3 +0,0 @@ -import bpy -bpy.context.fluid.domain_settings.viscosity_base = 5.0 -bpy.context.fluid.domain_settings.viscosity_exponent = 5 diff --git a/release/scripts/presets/fluid/water.py b/release/scripts/presets/fluid/water.py deleted file mode 100644 index f34ecc834ff..00000000000 --- a/release/scripts/presets/fluid/water.py +++ /dev/null @@ -1,3 +0,0 @@ -import bpy -bpy.context.fluid.domain_settings.viscosity_base = 1.0 -bpy.context.fluid.domain_settings.viscosity_exponent = 6 diff --git a/release/scripts/presets/gpencil_material/Fill_Only.py b/release/scripts/presets/gpencil_material/Fill_Only.py new file mode 100644 index 00000000000..aa4d58a8c10 --- /dev/null +++ b/release/scripts/presets/gpencil_material/Fill_Only.py @@ -0,0 +1,25 @@ +import bpy +material = bpy.context.object.active_material +gpcolor = material.grease_pencil + +gpcolor.mode = 'LINE' +gpcolor.stroke_style = 'SOLID' +gpcolor.color = (0.0, 0.0, 0.0, 0.0) +gpcolor.stroke_image = None +gpcolor.pixel_size = 100.0 +gpcolor.mix_stroke_factor = 0.0 +gpcolor.alignment_mode = 'PATH' +gpcolor.fill_style = 'SOLID' +gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0) +gpcolor.fill_image = None +gpcolor.gradient_type = 'LINEAR' +gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2) +gpcolor.mix_factor = 0.0 +gpcolor.flip = False +gpcolor.texture_offset = (0.0, 0.0) +gpcolor.texture_scale = (1.0, 1.0) +gpcolor.texture_angle = 0.0 +gpcolor.texture_clamp = False +gpcolor.mix_factor = 0.0 +gpcolor.show_stroke = False +gpcolor.show_fill = True diff --git a/release/scripts/presets/gpencil_material/Stroke_Only.py b/release/scripts/presets/gpencil_material/Stroke_Only.py new file mode 100644 index 00000000000..4e02b108e01 --- /dev/null +++ b/release/scripts/presets/gpencil_material/Stroke_Only.py @@ -0,0 +1,25 @@ +import bpy +material = bpy.context.object.active_material +gpcolor = material.grease_pencil + +gpcolor.mode = 'LINE' +gpcolor.stroke_style = 'SOLID' +gpcolor.color = (0.0, 0.0, 0.0, 1.0) +gpcolor.stroke_image = None +gpcolor.pixel_size = 100.0 +gpcolor.mix_stroke_factor = 0.0 +gpcolor.alignment_mode = 'PATH' +gpcolor.fill_style = 'SOLID' +gpcolor.fill_color = (0.5, 0.5, 0.5, 0.0) +gpcolor.fill_image = None +gpcolor.gradient_type = 'LINEAR' +gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2) +gpcolor.mix_factor = 0.0 +gpcolor.flip = False +gpcolor.texture_offset = (0.0, 0.0) +gpcolor.texture_scale = (1.0, 1.0) +gpcolor.texture_angle = 0.0 +gpcolor.texture_clamp = False +gpcolor.mix_factor = 0.0 +gpcolor.show_stroke = True +gpcolor.show_fill = False diff --git a/release/scripts/presets/gpencil_material/Stroke_and_Fill.py b/release/scripts/presets/gpencil_material/Stroke_and_Fill.py new file mode 100644 index 00000000000..3572036de5e --- /dev/null +++ b/release/scripts/presets/gpencil_material/Stroke_and_Fill.py @@ -0,0 +1,25 @@ +import bpy +material = bpy.context.object.active_material +gpcolor = material.grease_pencil + +gpcolor.mode = 'LINE' +gpcolor.stroke_style = 'SOLID' +gpcolor.color = (0.0, 0.0, 0.0, 1.0) +gpcolor.stroke_image = None +gpcolor.pixel_size = 100.0 +gpcolor.mix_stroke_factor = 0.0 +gpcolor.alignment_mode = 'PATH' +gpcolor.fill_style = 'SOLID' +gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0) +gpcolor.fill_image = None +gpcolor.gradient_type = 'LINEAR' +gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2) +gpcolor.mix_factor = 0.0 +gpcolor.flip = False +gpcolor.texture_offset = (0.0, 0.0) +gpcolor.texture_scale = (1.0, 1.0) +gpcolor.texture_angle = 0.0 +gpcolor.texture_clamp = False +gpcolor.mix_factor = 0.0 +gpcolor.show_stroke = True +gpcolor.show_fill = True diff --git a/release/scripts/presets/gpencil_material/fill_only.py b/release/scripts/presets/gpencil_material/fill_only.py deleted file mode 100644 index aa4d58a8c10..00000000000 --- a/release/scripts/presets/gpencil_material/fill_only.py +++ /dev/null @@ -1,25 +0,0 @@ -import bpy -material = bpy.context.object.active_material -gpcolor = material.grease_pencil - -gpcolor.mode = 'LINE' -gpcolor.stroke_style = 'SOLID' -gpcolor.color = (0.0, 0.0, 0.0, 0.0) -gpcolor.stroke_image = None -gpcolor.pixel_size = 100.0 -gpcolor.mix_stroke_factor = 0.0 -gpcolor.alignment_mode = 'PATH' -gpcolor.fill_style = 'SOLID' -gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0) -gpcolor.fill_image = None -gpcolor.gradient_type = 'LINEAR' -gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2) -gpcolor.mix_factor = 0.0 -gpcolor.flip = False -gpcolor.texture_offset = (0.0, 0.0) -gpcolor.texture_scale = (1.0, 1.0) -gpcolor.texture_angle = 0.0 -gpcolor.texture_clamp = False -gpcolor.mix_factor = 0.0 -gpcolor.show_stroke = False -gpcolor.show_fill = True diff --git a/release/scripts/presets/gpencil_material/stroke_and_fill.py b/release/scripts/presets/gpencil_material/stroke_and_fill.py deleted file mode 100644 index 3572036de5e..00000000000 --- a/release/scripts/presets/gpencil_material/stroke_and_fill.py +++ /dev/null @@ -1,25 +0,0 @@ -import bpy -material = bpy.context.object.active_material -gpcolor = material.grease_pencil - -gpcolor.mode = 'LINE' -gpcolor.stroke_style = 'SOLID' -gpcolor.color = (0.0, 0.0, 0.0, 1.0) -gpcolor.stroke_image = None -gpcolor.pixel_size = 100.0 -gpcolor.mix_stroke_factor = 0.0 -gpcolor.alignment_mode = 'PATH' -gpcolor.fill_style = 'SOLID' -gpcolor.fill_color = (0.5, 0.5, 0.5, 1.0) -gpcolor.fill_image = None -gpcolor.gradient_type = 'LINEAR' -gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2) -gpcolor.mix_factor = 0.0 -gpcolor.flip = False -gpcolor.texture_offset = (0.0, 0.0) -gpcolor.texture_scale = (1.0, 1.0) -gpcolor.texture_angle = 0.0 -gpcolor.texture_clamp = False -gpcolor.mix_factor = 0.0 -gpcolor.show_stroke = True -gpcolor.show_fill = True diff --git a/release/scripts/presets/gpencil_material/stroke_only.py b/release/scripts/presets/gpencil_material/stroke_only.py deleted file mode 100644 index 4e02b108e01..00000000000 --- a/release/scripts/presets/gpencil_material/stroke_only.py +++ /dev/null @@ -1,25 +0,0 @@ -import bpy -material = bpy.context.object.active_material -gpcolor = material.grease_pencil - -gpcolor.mode = 'LINE' -gpcolor.stroke_style = 'SOLID' -gpcolor.color = (0.0, 0.0, 0.0, 1.0) -gpcolor.stroke_image = None -gpcolor.pixel_size = 100.0 -gpcolor.mix_stroke_factor = 0.0 -gpcolor.alignment_mode = 'PATH' -gpcolor.fill_style = 'SOLID' -gpcolor.fill_color = (0.5, 0.5, 0.5, 0.0) -gpcolor.fill_image = None -gpcolor.gradient_type = 'LINEAR' -gpcolor.mix_color = (1.0, 1.0, 1.0, 0.2) -gpcolor.mix_factor = 0.0 -gpcolor.flip = False -gpcolor.texture_offset = (0.0, 0.0) -gpcolor.texture_scale = (1.0, 1.0) -gpcolor.texture_angle = 0.0 -gpcolor.texture_clamp = False -gpcolor.mix_factor = 0.0 -gpcolor.show_stroke = True -gpcolor.show_fill = False diff --git a/release/scripts/presets/hair_dynamics/Default.py b/release/scripts/presets/hair_dynamics/Default.py new file mode 100644 index 00000000000..830d28a76f0 --- /dev/null +++ b/release/scripts/presets/hair_dynamics/Default.py @@ -0,0 +1,17 @@ +import bpy +psys = bpy.context.particle_system +cloth = bpy.context.particle_system.cloth +settings = bpy.context.particle_system.cloth.settings +collision = bpy.context.particle_system.cloth.collision_settings + +settings.quality = 5 +settings.mass = 0.30000001192092896 +settings.bending_stiffness = 0.5 +psys.settings.bending_random = 0.0 +settings.bending_damping = 0.5 +settings.air_damping = 1.0 +settings.internal_friction = 0.0 +settings.density_target = 0.0 +settings.density_strength = 0.0 +settings.voxel_cell_size = 0.10000000149011612 +settings.pin_stiffness = 0.0 diff --git a/release/scripts/presets/hair_dynamics/default.py b/release/scripts/presets/hair_dynamics/default.py deleted file mode 100644 index 830d28a76f0..00000000000 --- a/release/scripts/presets/hair_dynamics/default.py +++ /dev/null @@ -1,17 +0,0 @@ -import bpy -psys = bpy.context.particle_system -cloth = bpy.context.particle_system.cloth -settings = bpy.context.particle_system.cloth.settings -collision = bpy.context.particle_system.cloth.collision_settings - -settings.quality = 5 -settings.mass = 0.30000001192092896 -settings.bending_stiffness = 0.5 -psys.settings.bending_random = 0.0 -settings.bending_damping = 0.5 -settings.air_damping = 1.0 -settings.internal_friction = 0.0 -settings.density_target = 0.0 -settings.density_strength = 0.0 -settings.voxel_cell_size = 0.10000000149011612 -settings.pin_stiffness = 0.0 diff --git a/release/scripts/presets/interface_theme/Blender_Dark.xml b/release/scripts/presets/interface_theme/Blender_Dark.xml new file mode 100644 index 00000000000..8bbb747447b --- /dev/null +++ b/release/scripts/presets/interface_theme/Blender_Dark.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/release/scripts/presets/interface_theme/Blender_Light.xml b/release/scripts/presets/interface_theme/Blender_Light.xml new file mode 100644 index 00000000000..91ccd574c31 --- /dev/null +++ b/release/scripts/presets/interface_theme/Blender_Light.xml @@ -0,0 +1,1534 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/release/scripts/presets/interface_theme/blender_dark.xml b/release/scripts/presets/interface_theme/blender_dark.xml deleted file mode 100644 index 8bbb747447b..00000000000 --- a/release/scripts/presets/interface_theme/blender_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml deleted file mode 100644 index 91ccd574c31..00000000000 --- a/release/scripts/presets/interface_theme/blender_light.xml +++ /dev/null @@ -1,1534 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/release/scripts/presets/keyconfig/Blender.py b/release/scripts/presets/keyconfig/Blender.py new file mode 100644 index 00000000000..eb66c961472 --- /dev/null +++ b/release/scripts/presets/keyconfig/Blender.py @@ -0,0 +1,249 @@ +import os +import bpy +from bpy.props import ( + BoolProperty, + EnumProperty, +) + +DIRNAME, FILENAME = os.path.split(__file__) +IDNAME = os.path.splitext(FILENAME)[0] + +def update_fn(_self, _context): + load() + + +class Prefs(bpy.types.KeyConfigPreferences): + bl_idname = IDNAME + + select_mouse: EnumProperty( + name="Select Mouse", + items=( + ('LEFT', "Left", + "Use left mouse button for selection. " + "The standard behavior that works well for mouse, trackpad and tablet devices"), + ('RIGHT', "Right", + "Use right mouse button for selection, and left mouse button for actions. " + "This works well primarily for keyboard and mouse devices"), + ), + description=( + "Mouse button used for selection" + ), + update=update_fn, + ) + spacebar_action: EnumProperty( + name="Spacebar Action", + items=( + ('PLAY', "Play", + "Toggle animation playback " + "('Shift-Space' for Tools)", + 1), + ('TOOL', "Tools", + "Open the popup tool-bar\n" + "When 'Space' is held and used as a modifier:\n" + "\u2022 Pressing the tools binding key switches to it immediately.\n" + "\u2022 Dragging the cursor over a tool and releasing activates it (like a pie menu).\n" + "For Play use 'Shift-Space'", + 0), + ('SEARCH', "Search", + "Open the operator search popup", + 2), + ), + description=( + "Action when 'Space' is pressed" + ), + default='PLAY', + update=update_fn, + ) + use_alt_click_leader: BoolProperty( + name="Alt Click Tool Prompt", + description=( + "Tapping Alt (without pressing any other keys) shows a prompt in the status-bar\n" + "prompting a second keystroke to activate the tool" + ), + default=False, + update=update_fn, + ) + use_select_all_toggle: BoolProperty( + name="Select All Toggles", + description=( + "Causes select-all ('A' key) to de-select in the case a selection exists" + ), + default=False, + update=update_fn, + ) + + gizmo_action: EnumProperty( + name="Activate Gizmo", + items=( + ('PRESS', "Press", "Press causes immediate activation, preventing click being passed to the tool"), + ('DRAG', "Drag", "Drag allows click events to pass through to the tool, adding a small delay"), + ), + description="Activation event for gizmos that support drag motion", + default='DRAG', + update=update_fn, + ) + + # 3D View + use_v3d_tab_menu: BoolProperty( + name="Tab for Pie Menu", + description=( + "Causes tab to open pie menu (swaps 'Tab' / 'Ctrl-Tab')" + ), + default=False, + update=update_fn, + ) + use_v3d_shade_ex_pie: BoolProperty( + name="Extra Shading Pie Menu Items", + description=( + "Show additional options in the shading menu ('Z')" + ), + default=False, + update=update_fn, + ) + v3d_tilde_action: EnumProperty( + name="Tilde Action", + items=( + ('VIEW', "Navigate", + "View operations (useful for keyboards without a numpad)", + 0), + ('GIZMO', "Gizmos", + "Control transform gizmos", + 1), + ), + description=( + "Action when 'Tilde' is pressed" + ), + default='VIEW', + update=update_fn, + ) + + v3d_mmb_action: EnumProperty( + name="MMB Action", + items=( + ('ORBIT', "Orbit", + "", + 0), + ('PAN', "Pan", + "", + 1), + ), + description=( + "The action when Middle-Mouse dragging in the viewport. " + "Shift-Middle-Mouse is used for the other action. " + "This applies to trackpad as well" + ), + update=update_fn, + ) + + v3d_alt_mmb_drag_action: EnumProperty( + name="Alt-MMB Drag Action", + items=( + ('RELATIVE', "Relative", + "Set the view axis where each mouse direction maps to an axis relative to the current orientation", + 0), + ('ABSOLUTE', "Absolute", + "Set the view axis where each mouse direction always maps to the same axis", + 1), + ), + description=( + "Action when Alt-MMB dragging in the 3D viewport" + ), + update=update_fn, + ) + + # Developer note, this is an experemental option. + use_pie_click_drag: BoolProperty( + name="Pie Menu on Drag", + description=( + "Activate some pie menus on drag,\n" + "allowing the tapping the same key to have a secondary action.\n" + "\n" + "\u2022 Tapping Tab in the 3D view toggles edit-mode, drag for mode menu.\n" + "\u2022 Tapping Z in the 3D view toggles wireframe, drag for draw modes.\n" + "\u2022 Tapping Tilde in the 3D view for first person navigation, drag for view axes" + ), + default=False, + update=update_fn, + ) + + def draw(self, layout): + layout.use_property_split = True + layout.use_property_decorate = False + + is_select_left = (self.select_mouse == 'LEFT') + + # General settings. + col = layout.column() + col.row().prop(self, "select_mouse", text="Select with Mouse Button", expand=True) + col.row().prop(self, "spacebar_action", text="Spacebar Action", expand=True) + + if is_select_left: + col.row().prop(self, "gizmo_action", text="Activate Gizmo Event", expand=True) + + # Checkboxes sub-layout. + col = layout.column() + sub = col.column(align=True) + row = sub.row() + row.prop(self, "use_select_all_toggle") + row.prop(self, "use_alt_click_leader") + + # 3DView settings. + col = layout.column() + col.label(text="3D View") + col.row().prop(self, "v3d_tilde_action", text="Grave Accent / Tilde Action", expand=True) + col.row().prop(self, "v3d_mmb_action", text="Middle Mouse Action", expand=True) + col.row().prop(self, "v3d_alt_mmb_drag_action", text="Alt Middle Mouse Drag Action", expand=True) + + # Checkboxes sub-layout. + col = layout.column() + sub = col.column(align=True) + sub.prop(self, "use_v3d_tab_menu") + sub.prop(self, "use_pie_click_drag") + sub.prop(self, "use_v3d_shade_ex_pie") + + +blender_default = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "blender_default.py")) + + +def load(): + from sys import platform + from bpy import context + from bl_keymap_utils.io import keyconfig_init_from_data + + prefs = context.preferences + kc = context.window_manager.keyconfigs.new(IDNAME) + kc_prefs = kc.preferences + + keyconfig_data = blender_default.generate_keymaps( + blender_default.Params( + select_mouse=kc_prefs.select_mouse, + use_mouse_emulate_3_button=( + prefs.inputs.use_mouse_emulate_3_button and + prefs.inputs.mouse_emulate_3_button_modifier == 'ALT' + ), + spacebar_action=kc_prefs.spacebar_action, + v3d_tilde_action=kc_prefs.v3d_tilde_action, + use_v3d_mmb_pan=(kc_prefs.v3d_mmb_action == 'PAN'), + v3d_alt_mmb_drag_action=kc_prefs.v3d_alt_mmb_drag_action, + use_select_all_toggle=kc_prefs.use_select_all_toggle, + use_v3d_tab_menu=kc_prefs.use_v3d_tab_menu, + use_v3d_shade_ex_pie=kc_prefs.use_v3d_shade_ex_pie, + use_gizmo_drag=( + kc_prefs.select_mouse == 'LEFT' and + kc_prefs.gizmo_action == 'DRAG' + ), + use_alt_click_leader=kc_prefs.use_alt_click_leader, + use_pie_click_drag=kc_prefs.use_pie_click_drag, + ), + ) + + if platform == 'darwin': + from bl_keymap_utils.platform_helpers import keyconfig_data_oskey_from_ctrl_for_macos + keyconfig_data = keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data) + + keyconfig_init_from_data(kc, keyconfig_data) + + +if __name__ == "__main__": + bpy.utils.register_class(Prefs) + load() diff --git a/release/scripts/presets/keyconfig/Blender_27x.py b/release/scripts/presets/keyconfig/Blender_27x.py new file mode 100644 index 00000000000..2a7f0b07fa6 --- /dev/null +++ b/release/scripts/presets/keyconfig/Blender_27x.py @@ -0,0 +1,103 @@ +# +# Notes on this key-map: +# +# This uses Blender's key-map, running with `legacy=True`. +# +# The intention of this key-map is to match Blender 2.7x which had many more key-map items available. +# +# There are some differences with the original Blender 2.7x key-map. +# There is no intention to change these are they are not considered significant +# enough to make a 1:1 match with the previous Blender version. +# +# These include: +# +# 3D View +# ======= +# +# - Border Render (`Shift-B` -> `Ctrl-B`) +# Both `Shift-B` and `Ctrl-B` were used. +# +# Time Line/Animation Views +# ========================= +# +# - Start Frame/End Frame (`S/E` -> `Ctrl-Home/Ctrl-End`) +# + +import os +import bpy +from bpy.props import ( + EnumProperty, +) + +DIRNAME, FILENAME = os.path.split(__file__) +IDNAME = os.path.splitext(FILENAME)[0] + + +def update_fn(_self, _context): + load() + + +class Prefs(bpy.types.KeyConfigPreferences): + bl_idname = IDNAME + + select_mouse: EnumProperty( + name="Select Mouse", + items=( + ('LEFT', "Left", + "Use left mouse button for selection. " + "The standard behavior that works well for mouse, trackpad and tablet devices"), + ('RIGHT', "Right", + "Use right mouse button for selection, and left mouse button for actions. " + "This works well primarily for keyboard and mouse devices"), + ), + description=( + "Mouse button used for selection" + ), + default='RIGHT', + update=update_fn, + ) + + def draw(self, layout): + layout.use_property_split = True + layout.use_property_decorate = False + + col = layout.column() + col.row().prop(self, "select_mouse", text="Select with Mouse Button", expand=True) + + +blender_default = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "blender_default.py")) + + +def load(): + from sys import platform + from bpy import context + from bl_keymap_utils.io import keyconfig_init_from_data + + prefs = context.preferences + kc = context.window_manager.keyconfigs.new(IDNAME) + kc_prefs = kc.preferences + + keyconfig_data = blender_default.generate_keymaps( + blender_default.Params( + select_mouse=kc_prefs.select_mouse, + use_mouse_emulate_3_button=( + prefs.inputs.use_mouse_emulate_3_button and + prefs.inputs.mouse_emulate_3_button_modifier == 'ALT' + ), + spacebar_action='SEARCH', + use_select_all_toggle=True, + use_gizmo_drag=False, + legacy=True, + ), + ) + + if platform == 'darwin': + from bl_keymap_utils.platform_helpers import keyconfig_data_oskey_from_ctrl_for_macos + keyconfig_data = keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data) + + keyconfig_init_from_data(kc, keyconfig_data) + + +if __name__ == "__main__": + bpy.utils.register_class(Prefs) + load() diff --git a/release/scripts/presets/keyconfig/Industry_Compatible.py b/release/scripts/presets/keyconfig/Industry_Compatible.py new file mode 100644 index 00000000000..09a43452e93 --- /dev/null +++ b/release/scripts/presets/keyconfig/Industry_Compatible.py @@ -0,0 +1,35 @@ +import os +import bpy + + +# ------------------------------------------------------------------------------ +# Keymap + +DIRNAME, FILENAME = os.path.split(__file__) +IDNAME = os.path.splitext(FILENAME)[0] + +def update_fn(_self, _context): + load() + + +industry_compatible = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "industry_compatible_data.py")) + + +def load(): + from sys import platform + from bl_keymap_utils.io import keyconfig_init_from_data + + prefs = bpy.context.preferences + + kc = bpy.context.window_manager.keyconfigs.new(IDNAME) + params = industry_compatible.Params(use_mouse_emulate_3_button=prefs.inputs.use_mouse_emulate_3_button) + keyconfig_data = industry_compatible.generate_keymaps(params) + + if platform == 'darwin': + from bl_keymap_utils.platform_helpers import keyconfig_data_oskey_from_ctrl_for_macos + keyconfig_data = keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data) + + keyconfig_init_from_data(kc, keyconfig_data) + +if __name__ == "__main__": + load() diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/blender.py deleted file mode 100644 index eb66c961472..00000000000 --- a/release/scripts/presets/keyconfig/blender.py +++ /dev/null @@ -1,249 +0,0 @@ -import os -import bpy -from bpy.props import ( - BoolProperty, - EnumProperty, -) - -DIRNAME, FILENAME = os.path.split(__file__) -IDNAME = os.path.splitext(FILENAME)[0] - -def update_fn(_self, _context): - load() - - -class Prefs(bpy.types.KeyConfigPreferences): - bl_idname = IDNAME - - select_mouse: EnumProperty( - name="Select Mouse", - items=( - ('LEFT', "Left", - "Use left mouse button for selection. " - "The standard behavior that works well for mouse, trackpad and tablet devices"), - ('RIGHT', "Right", - "Use right mouse button for selection, and left mouse button for actions. " - "This works well primarily for keyboard and mouse devices"), - ), - description=( - "Mouse button used for selection" - ), - update=update_fn, - ) - spacebar_action: EnumProperty( - name="Spacebar Action", - items=( - ('PLAY', "Play", - "Toggle animation playback " - "('Shift-Space' for Tools)", - 1), - ('TOOL', "Tools", - "Open the popup tool-bar\n" - "When 'Space' is held and used as a modifier:\n" - "\u2022 Pressing the tools binding key switches to it immediately.\n" - "\u2022 Dragging the cursor over a tool and releasing activates it (like a pie menu).\n" - "For Play use 'Shift-Space'", - 0), - ('SEARCH', "Search", - "Open the operator search popup", - 2), - ), - description=( - "Action when 'Space' is pressed" - ), - default='PLAY', - update=update_fn, - ) - use_alt_click_leader: BoolProperty( - name="Alt Click Tool Prompt", - description=( - "Tapping Alt (without pressing any other keys) shows a prompt in the status-bar\n" - "prompting a second keystroke to activate the tool" - ), - default=False, - update=update_fn, - ) - use_select_all_toggle: BoolProperty( - name="Select All Toggles", - description=( - "Causes select-all ('A' key) to de-select in the case a selection exists" - ), - default=False, - update=update_fn, - ) - - gizmo_action: EnumProperty( - name="Activate Gizmo", - items=( - ('PRESS', "Press", "Press causes immediate activation, preventing click being passed to the tool"), - ('DRAG', "Drag", "Drag allows click events to pass through to the tool, adding a small delay"), - ), - description="Activation event for gizmos that support drag motion", - default='DRAG', - update=update_fn, - ) - - # 3D View - use_v3d_tab_menu: BoolProperty( - name="Tab for Pie Menu", - description=( - "Causes tab to open pie menu (swaps 'Tab' / 'Ctrl-Tab')" - ), - default=False, - update=update_fn, - ) - use_v3d_shade_ex_pie: BoolProperty( - name="Extra Shading Pie Menu Items", - description=( - "Show additional options in the shading menu ('Z')" - ), - default=False, - update=update_fn, - ) - v3d_tilde_action: EnumProperty( - name="Tilde Action", - items=( - ('VIEW', "Navigate", - "View operations (useful for keyboards without a numpad)", - 0), - ('GIZMO', "Gizmos", - "Control transform gizmos", - 1), - ), - description=( - "Action when 'Tilde' is pressed" - ), - default='VIEW', - update=update_fn, - ) - - v3d_mmb_action: EnumProperty( - name="MMB Action", - items=( - ('ORBIT', "Orbit", - "", - 0), - ('PAN', "Pan", - "", - 1), - ), - description=( - "The action when Middle-Mouse dragging in the viewport. " - "Shift-Middle-Mouse is used for the other action. " - "This applies to trackpad as well" - ), - update=update_fn, - ) - - v3d_alt_mmb_drag_action: EnumProperty( - name="Alt-MMB Drag Action", - items=( - ('RELATIVE', "Relative", - "Set the view axis where each mouse direction maps to an axis relative to the current orientation", - 0), - ('ABSOLUTE', "Absolute", - "Set the view axis where each mouse direction always maps to the same axis", - 1), - ), - description=( - "Action when Alt-MMB dragging in the 3D viewport" - ), - update=update_fn, - ) - - # Developer note, this is an experemental option. - use_pie_click_drag: BoolProperty( - name="Pie Menu on Drag", - description=( - "Activate some pie menus on drag,\n" - "allowing the tapping the same key to have a secondary action.\n" - "\n" - "\u2022 Tapping Tab in the 3D view toggles edit-mode, drag for mode menu.\n" - "\u2022 Tapping Z in the 3D view toggles wireframe, drag for draw modes.\n" - "\u2022 Tapping Tilde in the 3D view for first person navigation, drag for view axes" - ), - default=False, - update=update_fn, - ) - - def draw(self, layout): - layout.use_property_split = True - layout.use_property_decorate = False - - is_select_left = (self.select_mouse == 'LEFT') - - # General settings. - col = layout.column() - col.row().prop(self, "select_mouse", text="Select with Mouse Button", expand=True) - col.row().prop(self, "spacebar_action", text="Spacebar Action", expand=True) - - if is_select_left: - col.row().prop(self, "gizmo_action", text="Activate Gizmo Event", expand=True) - - # Checkboxes sub-layout. - col = layout.column() - sub = col.column(align=True) - row = sub.row() - row.prop(self, "use_select_all_toggle") - row.prop(self, "use_alt_click_leader") - - # 3DView settings. - col = layout.column() - col.label(text="3D View") - col.row().prop(self, "v3d_tilde_action", text="Grave Accent / Tilde Action", expand=True) - col.row().prop(self, "v3d_mmb_action", text="Middle Mouse Action", expand=True) - col.row().prop(self, "v3d_alt_mmb_drag_action", text="Alt Middle Mouse Drag Action", expand=True) - - # Checkboxes sub-layout. - col = layout.column() - sub = col.column(align=True) - sub.prop(self, "use_v3d_tab_menu") - sub.prop(self, "use_pie_click_drag") - sub.prop(self, "use_v3d_shade_ex_pie") - - -blender_default = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "blender_default.py")) - - -def load(): - from sys import platform - from bpy import context - from bl_keymap_utils.io import keyconfig_init_from_data - - prefs = context.preferences - kc = context.window_manager.keyconfigs.new(IDNAME) - kc_prefs = kc.preferences - - keyconfig_data = blender_default.generate_keymaps( - blender_default.Params( - select_mouse=kc_prefs.select_mouse, - use_mouse_emulate_3_button=( - prefs.inputs.use_mouse_emulate_3_button and - prefs.inputs.mouse_emulate_3_button_modifier == 'ALT' - ), - spacebar_action=kc_prefs.spacebar_action, - v3d_tilde_action=kc_prefs.v3d_tilde_action, - use_v3d_mmb_pan=(kc_prefs.v3d_mmb_action == 'PAN'), - v3d_alt_mmb_drag_action=kc_prefs.v3d_alt_mmb_drag_action, - use_select_all_toggle=kc_prefs.use_select_all_toggle, - use_v3d_tab_menu=kc_prefs.use_v3d_tab_menu, - use_v3d_shade_ex_pie=kc_prefs.use_v3d_shade_ex_pie, - use_gizmo_drag=( - kc_prefs.select_mouse == 'LEFT' and - kc_prefs.gizmo_action == 'DRAG' - ), - use_alt_click_leader=kc_prefs.use_alt_click_leader, - use_pie_click_drag=kc_prefs.use_pie_click_drag, - ), - ) - - if platform == 'darwin': - from bl_keymap_utils.platform_helpers import keyconfig_data_oskey_from_ctrl_for_macos - keyconfig_data = keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data) - - keyconfig_init_from_data(kc, keyconfig_data) - - -if __name__ == "__main__": - bpy.utils.register_class(Prefs) - load() diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py deleted file mode 100644 index 2a7f0b07fa6..00000000000 --- a/release/scripts/presets/keyconfig/blender_27x.py +++ /dev/null @@ -1,103 +0,0 @@ -# -# Notes on this key-map: -# -# This uses Blender's key-map, running with `legacy=True`. -# -# The intention of this key-map is to match Blender 2.7x which had many more key-map items available. -# -# There are some differences with the original Blender 2.7x key-map. -# There is no intention to change these are they are not considered significant -# enough to make a 1:1 match with the previous Blender version. -# -# These include: -# -# 3D View -# ======= -# -# - Border Render (`Shift-B` -> `Ctrl-B`) -# Both `Shift-B` and `Ctrl-B` were used. -# -# Time Line/Animation Views -# ========================= -# -# - Start Frame/End Frame (`S/E` -> `Ctrl-Home/Ctrl-End`) -# - -import os -import bpy -from bpy.props import ( - EnumProperty, -) - -DIRNAME, FILENAME = os.path.split(__file__) -IDNAME = os.path.splitext(FILENAME)[0] - - -def update_fn(_self, _context): - load() - - -class Prefs(bpy.types.KeyConfigPreferences): - bl_idname = IDNAME - - select_mouse: EnumProperty( - name="Select Mouse", - items=( - ('LEFT', "Left", - "Use left mouse button for selection. " - "The standard behavior that works well for mouse, trackpad and tablet devices"), - ('RIGHT', "Right", - "Use right mouse button for selection, and left mouse button for actions. " - "This works well primarily for keyboard and mouse devices"), - ), - description=( - "Mouse button used for selection" - ), - default='RIGHT', - update=update_fn, - ) - - def draw(self, layout): - layout.use_property_split = True - layout.use_property_decorate = False - - col = layout.column() - col.row().prop(self, "select_mouse", text="Select with Mouse Button", expand=True) - - -blender_default = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "blender_default.py")) - - -def load(): - from sys import platform - from bpy import context - from bl_keymap_utils.io import keyconfig_init_from_data - - prefs = context.preferences - kc = context.window_manager.keyconfigs.new(IDNAME) - kc_prefs = kc.preferences - - keyconfig_data = blender_default.generate_keymaps( - blender_default.Params( - select_mouse=kc_prefs.select_mouse, - use_mouse_emulate_3_button=( - prefs.inputs.use_mouse_emulate_3_button and - prefs.inputs.mouse_emulate_3_button_modifier == 'ALT' - ), - spacebar_action='SEARCH', - use_select_all_toggle=True, - use_gizmo_drag=False, - legacy=True, - ), - ) - - if platform == 'darwin': - from bl_keymap_utils.platform_helpers import keyconfig_data_oskey_from_ctrl_for_macos - keyconfig_data = keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data) - - keyconfig_init_from_data(kc, keyconfig_data) - - -if __name__ == "__main__": - bpy.utils.register_class(Prefs) - load() diff --git a/release/scripts/presets/keyconfig/industry_compatible.py b/release/scripts/presets/keyconfig/industry_compatible.py deleted file mode 100644 index 09a43452e93..00000000000 --- a/release/scripts/presets/keyconfig/industry_compatible.py +++ /dev/null @@ -1,35 +0,0 @@ -import os -import bpy - - -# ------------------------------------------------------------------------------ -# Keymap - -DIRNAME, FILENAME = os.path.split(__file__) -IDNAME = os.path.splitext(FILENAME)[0] - -def update_fn(_self, _context): - load() - - -industry_compatible = bpy.utils.execfile(os.path.join(DIRNAME, "keymap_data", "industry_compatible_data.py")) - - -def load(): - from sys import platform - from bl_keymap_utils.io import keyconfig_init_from_data - - prefs = bpy.context.preferences - - kc = bpy.context.window_manager.keyconfigs.new(IDNAME) - params = industry_compatible.Params(use_mouse_emulate_3_button=prefs.inputs.use_mouse_emulate_3_button) - keyconfig_data = industry_compatible.generate_keymaps(params) - - if platform == 'darwin': - from bl_keymap_utils.platform_helpers import keyconfig_data_oskey_from_ctrl_for_macos - keyconfig_data = keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data) - - keyconfig_init_from_data(kc, keyconfig_data) - -if __name__ == "__main__": - load() diff --git a/release/scripts/presets/render/4K_UHDTV_2160p.py b/release/scripts/presets/render/4K_UHDTV_2160p.py new file mode 100644 index 00000000000..4517d2f435e --- /dev/null +++ b/release/scripts/presets/render/4K_UHDTV_2160p.py @@ -0,0 +1,8 @@ +import bpy +bpy.context.scene.render.resolution_x = 3840 +bpy.context.scene.render.resolution_y = 2160 +bpy.context.scene.render.resolution_percentage = 100 +bpy.context.scene.render.pixel_aspect_x = 1 +bpy.context.scene.render.pixel_aspect_y = 1 +bpy.context.scene.render.fps = 24 +bpy.context.scene.render.fps_base = 1 diff --git a/release/scripts/presets/render/4k_UHDTV_2160p.py b/release/scripts/presets/render/4k_UHDTV_2160p.py deleted file mode 100644 index 4517d2f435e..00000000000 --- a/release/scripts/presets/render/4k_UHDTV_2160p.py +++ /dev/null @@ -1,8 +0,0 @@ -import bpy -bpy.context.scene.render.resolution_x = 3840 -bpy.context.scene.render.resolution_y = 2160 -bpy.context.scene.render.resolution_percentage = 100 -bpy.context.scene.render.pixel_aspect_x = 1 -bpy.context.scene.render.pixel_aspect_y = 1 -bpy.context.scene.render.fps = 24 -bpy.context.scene.render.fps_base = 1 diff --git a/release/scripts/presets/tracking_settings/Blurry_Footage.py b/release/scripts/presets/tracking_settings/Blurry_Footage.py new file mode 100644 index 00000000000..253a8f395ba --- /dev/null +++ b/release/scripts/presets/tracking_settings/Blurry_Footage.py @@ -0,0 +1,18 @@ +import bpy +settings = bpy.context.edit_movieclip.tracking.settings + + +settings.default_pattern_size = 31 +settings.default_search_size = 91 +settings.default_motion_model = 'Loc' +settings.use_default_brute = True +settings.use_default_normalization = False +settings.use_default_mask = False +settings.default_frames_limit = 0 +settings.default_pattern_match = 'PREV_FRAME' +settings.default_margin = 0 +settings.use_default_red_channel = True +settings.use_default_green_channel = True +settings.use_default_blue_channel = True +settings.default_correlation_min = 0.6 +settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/Default.py b/release/scripts/presets/tracking_settings/Default.py new file mode 100644 index 00000000000..3d2481ce7ad --- /dev/null +++ b/release/scripts/presets/tracking_settings/Default.py @@ -0,0 +1,18 @@ +import bpy +settings = bpy.context.edit_movieclip.tracking.settings + + +settings.default_pattern_size = 21 +settings.default_search_size = 71 +settings.default_motion_model = 'Loc' +settings.use_default_brute = True +settings.use_default_normalization = False +settings.use_default_mask = False +settings.default_frames_limit = 0 +settings.default_pattern_match = 'KEYFRAME' +settings.default_margin = 0 +settings.use_default_red_channel = True +settings.use_default_green_channel = True +settings.use_default_blue_channel = True +settings.default_correlation_min = 0.75 +settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/Fast_Motion.py b/release/scripts/presets/tracking_settings/Fast_Motion.py new file mode 100644 index 00000000000..4294b7327d1 --- /dev/null +++ b/release/scripts/presets/tracking_settings/Fast_Motion.py @@ -0,0 +1,18 @@ +import bpy +settings = bpy.context.edit_movieclip.tracking.settings + + +settings.default_pattern_size = 31 +settings.default_search_size = 151 +settings.default_motion_model = 'LocRot' +settings.use_default_brute = True +settings.use_default_normalization = True +settings.use_default_mask = False +settings.default_frames_limit = 0 +settings.default_pattern_match = 'PREV_FRAME' +settings.default_margin = 0 +settings.use_default_red_channel = True +settings.use_default_green_channel = True +settings.use_default_blue_channel = True +settings.default_correlation_min = 0.6 +settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/Planar.py b/release/scripts/presets/tracking_settings/Planar.py new file mode 100644 index 00000000000..a099b3a800d --- /dev/null +++ b/release/scripts/presets/tracking_settings/Planar.py @@ -0,0 +1,18 @@ +import bpy +settings = bpy.context.edit_movieclip.tracking.settings + + +settings.default_pattern_size = 41 +settings.default_search_size = 91 +settings.default_motion_model = 'Perspective' +settings.use_default_brute = False +settings.use_default_normalization = False +settings.use_default_mask = False +settings.default_frames_limit = 0 +settings.default_pattern_match = 'KEYFRAME' +settings.default_margin = 0 +settings.use_default_red_channel = True +settings.use_default_green_channel = True +settings.use_default_blue_channel = True +settings.default_correlation_min = 0.75 +settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/blurry_footage.py b/release/scripts/presets/tracking_settings/blurry_footage.py deleted file mode 100644 index 253a8f395ba..00000000000 --- a/release/scripts/presets/tracking_settings/blurry_footage.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -settings = bpy.context.edit_movieclip.tracking.settings - - -settings.default_pattern_size = 31 -settings.default_search_size = 91 -settings.default_motion_model = 'Loc' -settings.use_default_brute = True -settings.use_default_normalization = False -settings.use_default_mask = False -settings.default_frames_limit = 0 -settings.default_pattern_match = 'PREV_FRAME' -settings.default_margin = 0 -settings.use_default_red_channel = True -settings.use_default_green_channel = True -settings.use_default_blue_channel = True -settings.default_correlation_min = 0.6 -settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/default.py b/release/scripts/presets/tracking_settings/default.py deleted file mode 100644 index 3d2481ce7ad..00000000000 --- a/release/scripts/presets/tracking_settings/default.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -settings = bpy.context.edit_movieclip.tracking.settings - - -settings.default_pattern_size = 21 -settings.default_search_size = 71 -settings.default_motion_model = 'Loc' -settings.use_default_brute = True -settings.use_default_normalization = False -settings.use_default_mask = False -settings.default_frames_limit = 0 -settings.default_pattern_match = 'KEYFRAME' -settings.default_margin = 0 -settings.use_default_red_channel = True -settings.use_default_green_channel = True -settings.use_default_blue_channel = True -settings.default_correlation_min = 0.75 -settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/fast_motion.py b/release/scripts/presets/tracking_settings/fast_motion.py deleted file mode 100644 index 4294b7327d1..00000000000 --- a/release/scripts/presets/tracking_settings/fast_motion.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -settings = bpy.context.edit_movieclip.tracking.settings - - -settings.default_pattern_size = 31 -settings.default_search_size = 151 -settings.default_motion_model = 'LocRot' -settings.use_default_brute = True -settings.use_default_normalization = True -settings.use_default_mask = False -settings.default_frames_limit = 0 -settings.default_pattern_match = 'PREV_FRAME' -settings.default_margin = 0 -settings.use_default_red_channel = True -settings.use_default_green_channel = True -settings.use_default_blue_channel = True -settings.default_correlation_min = 0.6 -settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_settings/planar.py b/release/scripts/presets/tracking_settings/planar.py deleted file mode 100644 index a099b3a800d..00000000000 --- a/release/scripts/presets/tracking_settings/planar.py +++ /dev/null @@ -1,18 +0,0 @@ -import bpy -settings = bpy.context.edit_movieclip.tracking.settings - - -settings.default_pattern_size = 41 -settings.default_search_size = 91 -settings.default_motion_model = 'Perspective' -settings.use_default_brute = False -settings.use_default_normalization = False -settings.use_default_mask = False -settings.default_frames_limit = 0 -settings.default_pattern_match = 'KEYFRAME' -settings.default_margin = 0 -settings.use_default_red_channel = True -settings.use_default_green_channel = True -settings.use_default_blue_channel = True -settings.default_correlation_min = 0.75 -settings.default_weight = 1.0 diff --git a/release/scripts/presets/tracking_track_color/Default.py b/release/scripts/presets/tracking_track_color/Default.py new file mode 100644 index 00000000000..3213d6e0c83 --- /dev/null +++ b/release/scripts/presets/tracking_track_color/Default.py @@ -0,0 +1,5 @@ +import bpy +track = bpy.context.edit_movieclip.tracking.tracks.active + +track.color = (0.0, 0.0, 0.0) +track.use_custom_color = False diff --git a/release/scripts/presets/tracking_track_color/Far_Plane.py b/release/scripts/presets/tracking_track_color/Far_Plane.py new file mode 100644 index 00000000000..579d5562642 --- /dev/null +++ b/release/scripts/presets/tracking_track_color/Far_Plane.py @@ -0,0 +1,5 @@ +import bpy +track = bpy.context.edit_movieclip.tracking.tracks.active + +track.color = (0.0, 0.0, 1.0) +track.use_custom_color = True diff --git a/release/scripts/presets/tracking_track_color/Near_Plane.py b/release/scripts/presets/tracking_track_color/Near_Plane.py new file mode 100644 index 00000000000..790429ce7a1 --- /dev/null +++ b/release/scripts/presets/tracking_track_color/Near_Plane.py @@ -0,0 +1,5 @@ +import bpy +track = bpy.context.edit_movieclip.tracking.tracks.active + +track.color = (0.0, 1.0, 0.0) +track.use_custom_color = True diff --git a/release/scripts/presets/tracking_track_color/Object.py b/release/scripts/presets/tracking_track_color/Object.py new file mode 100644 index 00000000000..5cb663d3f97 --- /dev/null +++ b/release/scripts/presets/tracking_track_color/Object.py @@ -0,0 +1,5 @@ +import bpy +track = bpy.context.edit_movieclip.tracking.tracks.active + +track.color = (1.0, 0.0, 1.0) +track.use_custom_color = True diff --git a/release/scripts/presets/tracking_track_color/default.py b/release/scripts/presets/tracking_track_color/default.py deleted file mode 100644 index 3213d6e0c83..00000000000 --- a/release/scripts/presets/tracking_track_color/default.py +++ /dev/null @@ -1,5 +0,0 @@ -import bpy -track = bpy.context.edit_movieclip.tracking.tracks.active - -track.color = (0.0, 0.0, 0.0) -track.use_custom_color = False diff --git a/release/scripts/presets/tracking_track_color/far_plane.py b/release/scripts/presets/tracking_track_color/far_plane.py deleted file mode 100644 index 579d5562642..00000000000 --- a/release/scripts/presets/tracking_track_color/far_plane.py +++ /dev/null @@ -1,5 +0,0 @@ -import bpy -track = bpy.context.edit_movieclip.tracking.tracks.active - -track.color = (0.0, 0.0, 1.0) -track.use_custom_color = True diff --git a/release/scripts/presets/tracking_track_color/near_plane.py b/release/scripts/presets/tracking_track_color/near_plane.py deleted file mode 100644 index 790429ce7a1..00000000000 --- a/release/scripts/presets/tracking_track_color/near_plane.py +++ /dev/null @@ -1,5 +0,0 @@ -import bpy -track = bpy.context.edit_movieclip.tracking.tracks.active - -track.color = (0.0, 1.0, 0.0) -track.use_custom_color = True diff --git a/release/scripts/presets/tracking_track_color/object.py b/release/scripts/presets/tracking_track_color/object.py deleted file mode 100644 index 5cb663d3f97..00000000000 --- a/release/scripts/presets/tracking_track_color/object.py +++ /dev/null @@ -1,5 +0,0 @@ -import bpy -track = bpy.context.edit_movieclip.tracking.tracks.active - -track.color = (1.0, 0.0, 1.0) -track.use_custom_color = True 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) -- cgit v1.2.3