Commit: 4887401789ea7716365bbd65207161f1dd3dd6cb
Author: Bastien Montagne
Date: Mon Jan 9 09:20:17 2023 +0100
Branches: master
https://developer.blender.org/rB4887401789ea7716365bbd65207161f1dd3dd6cb
Usual UI messages and i18n fixes and tweaks.
===================================================================
M intern/cycles/blender/addon/properties.py
M release/scripts/modules/bl_i18n_utils/settings.py
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/intern/cycles/blender/addon/properties.py
b/intern/cycles/blender/addon/properties.py
index a27a75e48fa..9ec663eb258 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -83,7 +83,7 @@ enum_use_layer_samples = (
enum_sampling_pattern = (
('SOBOL_BURLEY', "Sobol-Burley", "Use on-the-fly computed Owen-scrambled
Sobol for random sampling", 0),
- ('TABULATED_SOBOL', "Tabulated Sobol", "Use precomputed tables of
Owen-scrambled Sobol for random sampling", 1),
+ ('TABULATED_SOBOL', "Tabulated Sobol", "Use pre-computed tables of
Owen-scrambled Sobol for random sampling", 1),
)
enum_emission_sampling = (
@@ -905,7 +905,8 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
use_fast_gi: BoolProperty(
name="Fast GI Approximation",
- description="Approximate diffuse indirect light with background tinted
ambient occlusion. This provides fast alternative to full global illumination,
for interactive viewport rendering or final renders with reduced quality",
+ description="Approximate diffuse indirect light with background tinted
ambient occlusion. "
+ "This provides fast alternative to full global
illumination, for interactive viewport rendering or final renders with reduced
quality",
default=False,
)
@@ -1539,13 +1540,16 @@ class CyclesPreferences(bpy.types.AddonPreferences):
use_metalrt: BoolProperty(
name="MetalRT (Experimental)",
- description="MetalRT for ray tracing uses less memory for scenes which
use curves extensively, and can give better performance in specific cases.
However this support is experimental and some scenes may render incorrectly",
+ description="MetalRT for ray tracing uses less memory for scenes which
use curves extensively, and can give better "
+ "performance in specific cases. However this support is
experimental and some scenes may render incorrectly",
default=False,
)
kernel_optimization_level: EnumProperty(
name="Kernel Optimization",
- description="Kernels can be optimized based on scene content.
Optimized kernels are requested at the start of a render. If optimized kernels
are not available, rendering will proceed using generic kernels until the
optimized set is available in the cache. This can result in additional CPU
usage for a brief time (tens of seconds).",
+ description="Kernels can be optimized based on scene content.
Optimized kernels are requested at the start of a render. "
+ "If optimized kernels are not available, rendering will
proceed using generic kernels until the optimized set "
+ "is available in the cache. This can result in additional
CPU usage for a brief time (tens of seconds)",
default='FULL',
items=(
('OFF', "Off", "Disable kernel optimization. Slowest rendering, no
extra background CPU usage"),
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py
b/release/scripts/modules/bl_i18n_utils/settings.py
index 2f3efc47180..ed8bdb2e014 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -412,6 +412,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"selected",
"selected and lock unselected",
"selected and unlock unselected",
+ "screen",
"the lazy dog",
"this legacy pose library to pose assets",
"to the top level of the tree",
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index e4b755033aa..82ac9ea4970 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -542,6 +542,7 @@ class SpellChecker:
"voronoi",
"voxel", "voxels",
"vsync",
+ "vulkan",
"wireframe",
"zmask",
"ztransp",
diff --git a/release/scripts/startup/bl_ui/space_userpref.py
b/release/scripts/startup/bl_ui/space_userpref.py
index e58302fde06..945abe3f5a4 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -605,7 +605,7 @@ class USERPREF_PT_system_cycles_devices(SystemPanel,
CenterAlignMixIn, Panel):
class USERPREF_PT_system_gpu_backend(SystemPanel, CenterAlignMixIn, Panel):
- bl_label = "GPU Backend"
+ bl_label = "GPU Back end"
@classmethod
def poll(cls, _context):
@@ -622,7 +622,7 @@ class USERPREF_PT_system_gpu_backend(SystemPanel,
CenterAlignMixIn, Panel):
col.prop(system, "gpu_backend")
if system.gpu_backend != gpu.platform.backend_type_get():
- layout.label(text="Requires a restart of Blender to take effect.",
icon='INFO')
+ layout.label(text="Requires a restart of Blender to take effect",
icon='INFO')
class USERPREF_PT_system_os_settings(SystemPanel, CenterAlignMixIn, Panel):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 83066cb70bf..60494aa4d9e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -6224,7 +6224,7 @@ class VIEW3D_PT_shading_compositor(Panel):
row.active = not is_macos
row.prop(shading, "use_compositor", expand=True)
if is_macos and shading.use_compositor != "DISABLED":
- self.layout.label(text="Compositor not supported on MacOS.",
icon='ERROR')
+ self.layout.label(text="Compositor not supported on MacOS",
icon='ERROR')
class VIEW3D_PT_gizmo_display(Panel):
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index d10b82c4a16..ba9d750f1bb 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -141,9 +141,9 @@ static const EnumPropertyItem
rna_enum_userdef_viewport_aa_items[] = {
};
static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = {
- {GPU_BACKEND_OPENGL, "OPENGL", 0, "OpenGL", "Use OpenGL backend"},
- {GPU_BACKEND_METAL, "METAL", 0, "Metal", "Use Metal backend"},
- {GPU_BACKEND_VULKAN, "VULKAN", 0, "Vulkan", "Use Vulkan backend"},
+ {GPU_BACKEND_OPENGL, "OPENGL", 0, "OpenGL", "Use OpenGL back end"},
+ {GPU_BACKEND_METAL, "METAL", 0, "Metal", "Use Metal back end"},
+ {GPU_BACKEND_VULKAN, "VULKAN", 0, "Vulkan", "Use Vulkan back end"},
{0, NULL, 0, NULL, NULL},
};
@@ -5647,8 +5647,8 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_enum_funcs(prop, NULL, NULL,
"rna_preference_gpu_backend_itemf");
RNA_def_property_ui_text(
prop,
- "GPU Backend",
- "GPU backend to use. (Requires restarting Blender for changes to take
effect)");
+ "GPU Back end",
+ "GPU back end to use (requires restarting Blender for changes to take
effect)");
/* Audio */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
