From 76169472d3986dc5ab3241ee52eb46951d5435cb Mon Sep 17 00:00:00 2001 From: Nikita Sirgienko Date: Mon, 1 Aug 2022 12:43:31 +0200 Subject: =?UTF-8?q?Cycles:=20Resolve=20recent=20performance=20regression?= =?UTF-8?q?=20in=20oneAPI=20implementation=20for=20Intel=C2=AE=20Arc?= =?UTF-8?q?=E2=84=A2=20GPUs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recently, performance with oneAPI have regressed due some recent changes in Blender itself. This commit's changes is resolving this and also improve compilation time for oneAPI backend first execution (or Blender compilation time in case of AoT). Regression have appeared after 5152c7c152e and not related to the changes itself, but increase of kernels complexity introduced with it. Changes in this commit is marking some Blender functions as noinlined for oneAPI backend, which helps GPU compiler to deal with this complexity without any negative side-effects on performance. --- intern/cycles/kernel/device/oneapi/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/kernel/device/oneapi/compat.h b/intern/cycles/kernel/device/oneapi/compat.h index 1b25259bcf5..d8234ee1400 100644 --- a/intern/cycles/kernel/device/oneapi/compat.h +++ b/intern/cycles/kernel/device/oneapi/compat.h @@ -30,7 +30,7 @@ #define ccl_global #define ccl_always_inline __attribute__((always_inline)) #define ccl_device_inline inline -#define ccl_noinline +#define ccl_noinline __attribute__((noinline)) #define ccl_inline_constant const constexpr #define ccl_static_constant const #define ccl_device_forceinline __attribute__((always_inline)) -- cgit v1.2.3 From 1875c5d24c1b3f463356d1922a6b9ad47c3c75ea Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Mon, 1 Aug 2022 11:26:28 +0200 Subject: I18n: make Grease Pencil modifiers and shader FX translatable. Pretty much like D15418: add `N_()` macro around names for Grease Pencil modifiers and shader FX. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D15532 --- source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c | 4 +++- source/blender/gpencil_modifiers/intern/MOD_gpencildash.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencillength.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c | 4 +++- source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c | 4 +++- source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c | 4 +++- source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c | 4 +++- source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c | 4 +++- source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c | 4 +++- source/blender/shader_fx/intern/FX_shader_blur.c | 2 +- source/blender/shader_fx/intern/FX_shader_colorize.c | 2 +- source/blender/shader_fx/intern/FX_shader_flip.c | 2 +- source/blender/shader_fx/intern/FX_shader_glow.c | 4 +++- source/blender/shader_fx/intern/FX_shader_pixel.c | 2 +- source/blender/shader_fx/intern/FX_shader_rim.c | 2 +- source/blender/shader_fx/intern/FX_shader_shadow.c | 2 +- source/blender/shader_fx/intern/FX_shader_swirl.c | 4 +++- source/blender/shader_fx/intern/FX_shader_wave.c | 4 +++- 33 files changed, 53 insertions(+), 33 deletions(-) diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index 092253dde79..d99d9950efb 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -191,7 +191,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Armature = { - /* name */ "Armature", + /* name */ N_("Armature"), /* structName */ "ArmatureGpencilModifierData", /* structSize */ sizeof(ArmatureGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index 407055c6165..8bb61136cc2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -447,7 +447,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Array = { - /* name */ "Array", + /* name */ N_("Array"), /* structName */ "ArrayGpencilModifierData", /* structSize */ sizeof(ArrayGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c index cf390e8d3a0..3c971ec6af0 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c @@ -877,7 +877,7 @@ static void updateDepsgraph(GpencilModifierData *md, /* ******************************************** */ GpencilModifierTypeInfo modifierType_Gpencil_Build = { - /* name */ "Build", + /* name */ N_("Build"), /* structName */ "BuildGpencilModifierData", /* structSize */ sizeof(BuildGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 8ada66cfd55..7abbd0661cf 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -12,6 +12,8 @@ #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "BLT_translation.h" + #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" @@ -202,7 +204,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Color = { - /* name */ "Hue/Saturation", + /* name */ N_("Hue/Saturation"), /* structName */ "ColorGpencilModifierData", /* structSize */ sizeof(ColorGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c index 41015c429fe..5033e67d52e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c @@ -363,7 +363,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Dash = { - /* name */ "Dot Dash", + /* name */ N_("Dot Dash"), /* structName */ "DashGpencilModifierData", /* structSize */ sizeof(DashGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c index 0f1652a5620..ec0ed1f6a35 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c @@ -645,7 +645,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Envelope = { - /* name */ "Envelope", + /* name */ N_("Envelope"), /* structName */ "EnvelopeGpencilModifierData", /* structSize */ sizeof(EnvelopeGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index 652894af017..1a2bfebdc55 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -387,7 +387,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Hook = { - /* name */ "Hook", + /* name */ N_("Hook"), /* structName */ "HookGpencilModifierData", /* structSize */ sizeof(HookGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index 30f1a004338..7365c59dd5f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -247,7 +247,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Lattice = { - /* name */ "Lattice", + /* name */ N_("Lattice"), /* structName */ "LatticeGpencilModifierData", /* structSize */ sizeof(LatticeGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c index 5a358f5b3a1..c1a978162b8 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c @@ -355,7 +355,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Length = { - /* name */ "Length", + /* name */ N_("Length"), /* structName */ "LengthGpencilModifierData", /* structSize */ sizeof(LengthGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 1a8d1e75746..326e86091c5 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -243,7 +243,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Mirror = { - /* name */ "Mirror", + /* name */ N_("Mirror"), /* structName */ "MirrorGpencilModifierData", /* structSize */ sizeof(MirrorGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c index fd4eb5da835..1cf11a694ac 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c @@ -20,6 +20,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "BKE_context.h" #include "BKE_gpencil.h" #include "BKE_gpencil_geom.h" @@ -311,7 +313,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Multiply = { - /* name */ "MultipleStrokes", + /* name */ N_("MultipleStrokes"), /* structName */ "MultiplyGpencilModifierData", /* structSize */ sizeof(MultiplyGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index 253603aea67..4bbcbf775db 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -339,7 +339,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Noise = { - /* name */ "Noise", + /* name */ N_("Noise"), /* structName */ "NoiseGpencilModifierData", /* structSize */ sizeof(NoiseGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index ba88c83161f..8f0abd0a88e 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -228,7 +228,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Offset = { - /* name */ "Offset", + /* name */ N_("Offset"), /* structName */ "OffsetGpencilModifierData", /* structSize */ sizeof(OffsetGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index 0bcbd71f029..98f26dbd597 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -279,7 +279,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Opacity = { - /* name */ "Opacity", + /* name */ N_("Opacity"), /* structName */ "OpacityGpencilModifierData", /* structSize */ sizeof(OpacityGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c index 09c1005ecac..f492e9ee044 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c @@ -307,7 +307,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Shrinkwrap = { - /* name */ "Shrinkwrap", + /* name */ N_("Shrinkwrap"), /* structName */ "ShrinkwrapGpencilModifierData", /* structSize */ sizeof(ShrinkwrapGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c index 07350b73ce3..41de8d74257 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c @@ -11,6 +11,8 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" @@ -157,7 +159,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Simplify = { - /* name */ "Simplify", + /* name */ N_("Simplify"), /* structName */ "SimplifyGpencilModifierData", /* structSize */ sizeof(SimplifyGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c index 1992ebd1508..977be634490 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c @@ -203,7 +203,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Smooth = { - /* name */ "Smooth", + /* name */ N_("Smooth"), /* structName */ "SmoothGpencilModifierData", /* structSize */ sizeof(SmoothGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c index 73f8dada971..b856f7d81dc 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c @@ -124,7 +124,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Subdiv = { - /* name */ "Subdivide", + /* name */ N_("Subdivide"), /* structName */ "SubdivGpencilModifierData", /* structSize */ sizeof(SubdivGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c index 6ba7a934bff..16c8365153a 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c @@ -178,7 +178,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Texture = { - /* name */ "TextureMapping", + /* name */ N_("TextureMapping"), /* structName */ "TextureGpencilModifierData", /* structSize */ sizeof(TextureGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 68fe15df898..81343fb5180 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -11,6 +11,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" @@ -204,7 +206,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Thick = { - /* name */ "Thickness", + /* name */ N_("Thickness"), /* structName */ "ThickGpencilModifierData", /* structSize */ sizeof(ThickGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c index 414231fcae5..1d45030b68b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c @@ -230,7 +230,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Time = { - /* name */ "TimeOffset", + /* name */ N_("TimeOffset"), /* structName */ "TimeGpencilModifierData", /* structSize */ sizeof(TimeGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index ad8804782e8..94d8cb98290 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -12,6 +12,8 @@ #include "BLI_listbase.h" #include "BLI_math_vector.h" +#include "BLT_translation.h" + #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" @@ -365,7 +367,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_Tint = { - /* name */ "Tint", + /* name */ N_("Tint"), /* structName */ "TintGpencilModifierData", /* structSize */ sizeof(TintGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c index f40e6ba0728..3ecff4bf447 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c @@ -11,6 +11,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" @@ -209,7 +211,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_WeightAngle = { - /* name */ "Vertex Weight Angle", + /* name */ N_("Vertex Weight Angle"), /* structName */ "WeightAngleGpencilModifierData", /* structSize */ sizeof(WeightAngleGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c index 1a6cadabf51..f64c83443d8 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c @@ -11,6 +11,8 @@ #include "BLI_math_vector.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" @@ -226,7 +228,7 @@ static void panelRegister(ARegionType *region_type) } GpencilModifierTypeInfo modifierType_Gpencil_WeightProximity = { - /* name */ "Vertex Weight Proximity", + /* name */ N_("Vertex Weight Proximity"), /* structName */ "WeightProxGpencilModifierData", /* structSize */ sizeof(WeightProxGpencilModifierData), /* type */ eGpencilModifierTypeType_Gpencil, diff --git a/source/blender/shader_fx/intern/FX_shader_blur.c b/source/blender/shader_fx/intern/FX_shader_blur.c index 0d57b4c97e0..14e9a647105 100644 --- a/source/blender/shader_fx/intern/FX_shader_blur.c +++ b/source/blender/shader_fx/intern/FX_shader_blur.c @@ -64,7 +64,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Blur = { - /* name */ "Blur", + /* name */ N_("Blur"), /* structName */ "BlurShaderFxData", /* structSize */ sizeof(BlurShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.c b/source/blender/shader_fx/intern/FX_shader_colorize.c index 97ced68b0cf..5551b16f445 100644 --- a/source/blender/shader_fx/intern/FX_shader_colorize.c +++ b/source/blender/shader_fx/intern/FX_shader_colorize.c @@ -71,7 +71,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Colorize = { - /* name */ "Colorize", + /* name */ N_("Colorize"), /* structName */ "ColorizeShaderFxData", /* structSize */ sizeof(ColorizeShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c index 050550bb24d..5b5c12205ca 100644 --- a/source/blender/shader_fx/intern/FX_shader_flip.c +++ b/source/blender/shader_fx/intern/FX_shader_flip.c @@ -61,7 +61,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Flip = { - /* name */ "Flip", + /* name */ N_("Flip"), /* structName */ "FlipShaderFxData", /* structSize */ sizeof(FlipShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c index 0aaacd1036e..b620754225a 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.c +++ b/source/blender/shader_fx/intern/FX_shader_glow.c @@ -15,6 +15,8 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "BKE_context.h" #include "BKE_modifier.h" #include "BKE_screen.h" @@ -80,7 +82,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Glow = { - /* name */ "Glow", + /* name */ N_("Glow"), /* structName */ "GlowShaderFxData", /* structSize */ sizeof(GlowShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.c b/source/blender/shader_fx/intern/FX_shader_pixel.c index 0eca0643c69..6f43bfb32b7 100644 --- a/source/blender/shader_fx/intern/FX_shader_pixel.c +++ b/source/blender/shader_fx/intern/FX_shader_pixel.c @@ -62,7 +62,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Pixel = { - /* name */ "Pixelate", + /* name */ N_("Pixelate"), /* structName */ "PixelShaderFxData", /* structSize */ sizeof(PixelShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_rim.c b/source/blender/shader_fx/intern/FX_shader_rim.c index ec48e86706b..d314724eaca 100644 --- a/source/blender/shader_fx/intern/FX_shader_rim.c +++ b/source/blender/shader_fx/intern/FX_shader_rim.c @@ -89,7 +89,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Rim = { - /* name */ "Rim", + /* name */ N_("Rim"), /* structName */ "RimShaderFxData", /* structSize */ sizeof(RimShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c index fdce7bf6e20..4b8b44cc5b0 100644 --- a/source/blender/shader_fx/intern/FX_shader_shadow.c +++ b/source/blender/shader_fx/intern/FX_shader_shadow.c @@ -159,7 +159,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Shadow = { - /* name */ "Shadow", + /* name */ N_("Shadow"), /* structName */ "ShadowShaderFxData", /* structSize */ sizeof(ShadowShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.c b/source/blender/shader_fx/intern/FX_shader_swirl.c index 6d835382b29..059fe0ca8b6 100644 --- a/source/blender/shader_fx/intern/FX_shader_swirl.c +++ b/source/blender/shader_fx/intern/FX_shader_swirl.c @@ -15,6 +15,8 @@ #include "BLI_math_base.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" @@ -88,7 +90,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Swirl = { - /* name */ "Swirl", + /* name */ N_("Swirl"), /* structName */ "SwirlShaderFxData", /* structSize */ sizeof(SwirlShaderFxData), /* type */ eShaderFxType_GpencilType, diff --git a/source/blender/shader_fx/intern/FX_shader_wave.c b/source/blender/shader_fx/intern/FX_shader_wave.c index 28469ca42b9..947bf58ec7c 100644 --- a/source/blender/shader_fx/intern/FX_shader_wave.c +++ b/source/blender/shader_fx/intern/FX_shader_wave.c @@ -17,6 +17,8 @@ #include "BLI_utildefines.h" +#include "BLT_translation.h" + #include "UI_interface.h" #include "UI_resources.h" @@ -61,7 +63,7 @@ static void panelRegister(ARegionType *region_type) } ShaderFxTypeInfo shaderfx_Type_Wave = { - /* name */ "WaveDistortion", + /* name */ N_("WaveDistortion"), /* structName */ "WaveShaderFxData", /* structSize */ sizeof(WaveShaderFxData), /* type */ eShaderFxType_GpencilType, -- cgit v1.2.3 From 543b47f1628487548888ab6f4a13e8556dc84509 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Mon, 1 Aug 2022 14:01:57 +0200 Subject: I18n: make newly added constraints' names translatable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the same principle as D15418 and D15532, but this time it's only really needed for "IK". Nevertheless it's probably good to add them anyway in case they get renamed and don't share a translation with other messages somewhere else in the code, for instance if it is decided that new constraint names shouldn’t include spaces, like other data do. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D15571 --- source/blender/blenkernel/intern/constraint.c | 58 +++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 0534899a86c..9f1d2d7bbb2 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1111,7 +1111,7 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar static bConstraintTypeInfo CTI_CHILDOF = { CONSTRAINT_TYPE_CHILDOF, /* type */ sizeof(bChildOfConstraint), /* size */ - "Child Of", /* name */ + N_("Child Of"), /* name */ "bChildOfConstraint", /* struct name */ NULL, /* free data */ childof_id_looper, /* id looper */ @@ -1296,7 +1296,7 @@ static void trackto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar static bConstraintTypeInfo CTI_TRACKTO = { CONSTRAINT_TYPE_TRACKTO, /* type */ sizeof(bTrackToConstraint), /* size */ - "Track To", /* name */ + N_("Track To"), /* name */ "bTrackToConstraint", /* struct name */ NULL, /* free data */ trackto_id_looper, /* id looper */ @@ -1402,7 +1402,7 @@ static void kinematic_get_tarmat(struct Depsgraph *UNUSED(depsgraph), static bConstraintTypeInfo CTI_KINEMATIC = { CONSTRAINT_TYPE_KINEMATIC, /* type */ sizeof(bKinematicConstraint), /* size */ - "IK", /* name */ + N_("IK"), /* name */ "bKinematicConstraint", /* struct name */ NULL, /* free data */ kinematic_id_looper, /* id looper */ @@ -1580,7 +1580,7 @@ static void followpath_evaluate(bConstraint *con, bConstraintOb *cob, ListBase * static bConstraintTypeInfo CTI_FOLLOWPATH = { CONSTRAINT_TYPE_FOLLOWPATH, /* type */ sizeof(bFollowPathConstraint), /* size */ - "Follow Path", /* name */ + N_("Follow Path"), /* name */ "bFollowPathConstraint", /* struct name */ NULL, /* free data */ followpath_id_looper, /* id looper */ @@ -1633,7 +1633,7 @@ static void loclimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *UN static bConstraintTypeInfo CTI_LOCLIMIT = { CONSTRAINT_TYPE_LOCLIMIT, /* type */ sizeof(bLocLimitConstraint), /* size */ - "Limit Location", /* name */ + N_("Limit Location"), /* name */ "bLocLimitConstraint", /* struct name */ NULL, /* free data */ NULL, /* id looper */ @@ -1714,7 +1714,7 @@ static void rotlimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *UN static bConstraintTypeInfo CTI_ROTLIMIT = { CONSTRAINT_TYPE_ROTLIMIT, /* type */ sizeof(bRotLimitConstraint), /* size */ - "Limit Rotation", /* name */ + N_("Limit Rotation"), /* name */ "bRotLimitConstraint", /* struct name */ NULL, /* free data */ NULL, /* id looper */ @@ -1781,7 +1781,7 @@ static void sizelimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *U static bConstraintTypeInfo CTI_SIZELIMIT = { CONSTRAINT_TYPE_SIZELIMIT, /* type */ sizeof(bSizeLimitConstraint), /* size */ - "Limit Scale", /* name */ + N_("Limit Scale"), /* name */ "bSizeLimitConstraint", /* struct name */ NULL, /* free data */ NULL, /* id looper */ @@ -1878,7 +1878,7 @@ static void loclike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar static bConstraintTypeInfo CTI_LOCLIKE = { CONSTRAINT_TYPE_LOCLIKE, /* type */ sizeof(bLocateLikeConstraint), /* size */ - "Copy Location", /* name */ + N_("Copy Location"), /* name */ "bLocateLikeConstraint", /* struct name */ NULL, /* free data */ loclike_id_looper, /* id looper */ @@ -2055,7 +2055,7 @@ static void rotlike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar static bConstraintTypeInfo CTI_ROTLIKE = { CONSTRAINT_TYPE_ROTLIKE, /* type */ sizeof(bRotateLikeConstraint), /* size */ - "Copy Rotation", /* name */ + N_("Copy Rotation"), /* name */ "bRotateLikeConstraint", /* struct name */ NULL, /* free data */ rotlike_id_looper, /* id looper */ @@ -2185,7 +2185,7 @@ static void sizelike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *ta static bConstraintTypeInfo CTI_SIZELIKE = { CONSTRAINT_TYPE_SIZELIKE, /* type */ sizeof(bSizeLikeConstraint), /* size */ - "Copy Scale", /* name */ + N_("Copy Scale"), /* name */ "bSizeLikeConstraint", /* struct name */ NULL, /* free data */ sizelike_id_looper, /* id looper */ @@ -2291,7 +2291,7 @@ static void translike_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t static bConstraintTypeInfo CTI_TRANSLIKE = { CONSTRAINT_TYPE_TRANSLIKE, /* type */ sizeof(bTransLikeConstraint), /* size */ - "Copy Transforms", /* name */ + N_("Copy Transforms"), /* name */ "bTransLikeConstraint", /* struct name */ NULL, /* free data */ translike_id_looper, /* id looper */ @@ -2360,7 +2360,7 @@ static void samevolume_evaluate(bConstraint *con, bConstraintOb *cob, ListBase * static bConstraintTypeInfo CTI_SAMEVOL = { CONSTRAINT_TYPE_SAMEVOL, /* type */ sizeof(bSameVolumeConstraint), /* size */ - "Maintain Volume", /* name */ + N_("Maintain Volume"), /* name */ "bSameVolumeConstraint", /* struct name */ NULL, /* free data */ NULL, /* id looper */ @@ -2492,7 +2492,7 @@ static void pycon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targe static bConstraintTypeInfo CTI_PYTHON = { CONSTRAINT_TYPE_PYTHON, /* type */ sizeof(bPythonConstraint), /* size */ - "Script", /* name */ + N_("Script"), /* name */ "bPythonConstraint", /* struct name */ pycon_free, /* free data */ pycon_id_looper, /* id looper */ @@ -2739,7 +2739,7 @@ static void armdef_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ static bConstraintTypeInfo CTI_ARMATURE = { CONSTRAINT_TYPE_ARMATURE, /* type */ sizeof(bArmatureConstraint), /* size */ - "Armature", /* name */ + N_("Armature"), /* name */ "bArmatureConstraint", /* struct name */ armdef_free, /* free data */ armdef_id_looper, /* id looper */ @@ -2955,7 +2955,7 @@ static void actcon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ static bConstraintTypeInfo CTI_ACTION = { CONSTRAINT_TYPE_ACTION, /* type */ sizeof(bActionConstraint), /* size */ - "Action", /* name */ + N_("Action"), /* name */ "bActionConstraint", /* struct name */ NULL, /* free data */ actcon_id_looper, /* id looper */ @@ -3271,7 +3271,7 @@ static void locktrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t static bConstraintTypeInfo CTI_LOCKTRACK = { CONSTRAINT_TYPE_LOCKTRACK, /* type */ sizeof(bLockTrackConstraint), /* size */ - "Locked Track", /* name */ + N_("Locked Track"), /* name */ "bLockTrackConstraint", /* struct name */ NULL, /* free data */ locktrack_id_looper, /* id looper */ @@ -3414,7 +3414,7 @@ static void distlimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t static bConstraintTypeInfo CTI_DISTLIMIT = { CONSTRAINT_TYPE_DISTLIMIT, /* type */ sizeof(bDistLimitConstraint), /* size */ - "Limit Distance", /* name */ + N_("Limit Distance"), /* name */ "bDistLimitConstraint", /* struct name */ NULL, /* free data */ distlimit_id_looper, /* id looper */ @@ -3622,7 +3622,7 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t static bConstraintTypeInfo CTI_STRETCHTO = { CONSTRAINT_TYPE_STRETCHTO, /* type */ sizeof(bStretchToConstraint), /* size */ - "Stretch To", /* name */ + N_("Stretch To"), /* name */ "bStretchToConstraint", /* struct name */ NULL, /* free data */ stretchto_id_looper, /* id looper */ @@ -3753,7 +3753,7 @@ static void minmax_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ static bConstraintTypeInfo CTI_MINMAX = { CONSTRAINT_TYPE_MINMAX, /* type */ sizeof(bMinMaxConstraint), /* size */ - "Floor", /* name */ + N_("Floor"), /* name */ "bMinMaxConstraint", /* struct name */ NULL, /* free data */ minmax_id_looper, /* id looper */ @@ -3939,7 +3939,7 @@ static void clampto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar static bConstraintTypeInfo CTI_CLAMPTO = { CONSTRAINT_TYPE_CLAMPTO, /* type */ sizeof(bClampToConstraint), /* size */ - "Clamp To", /* name */ + N_("Clamp To"), /* name */ "bClampToConstraint", /* struct name */ NULL, /* free data */ clampto_id_looper, /* id looper */ @@ -4148,7 +4148,7 @@ static void transform_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t static bConstraintTypeInfo CTI_TRANSFORM = { CONSTRAINT_TYPE_TRANSFORM, /* type */ sizeof(bTransformConstraint), /* size */ - "Transformation", /* name */ + N_("Transformation"), /* name */ "bTransformConstraint", /* struct name */ NULL, /* free data */ transform_id_looper, /* id looper */ @@ -4379,7 +4379,7 @@ static void shrinkwrap_evaluate(bConstraint *UNUSED(con), bConstraintOb *cob, Li static bConstraintTypeInfo CTI_SHRINKWRAP = { CONSTRAINT_TYPE_SHRINKWRAP, /* type */ sizeof(bShrinkwrapConstraint), /* size */ - "Shrinkwrap", /* name */ + N_("Shrinkwrap"), /* name */ "bShrinkwrapConstraint", /* struct name */ NULL, /* free data */ shrinkwrap_id_looper, /* id looper */ @@ -4544,7 +4544,7 @@ static void damptrack_do_transform(float matrix[4][4], const float tarvec_in[3], static bConstraintTypeInfo CTI_DAMPTRACK = { CONSTRAINT_TYPE_DAMPTRACK, /* type */ sizeof(bDampTrackConstraint), /* size */ - "Damped Track", /* name */ + N_("Damped Track"), /* name */ "bDampTrackConstraint", /* struct name */ NULL, /* free data */ damptrack_id_looper, /* id looper */ @@ -4639,7 +4639,7 @@ static void splineik_get_tarmat(struct Depsgraph *UNUSED(depsgraph), static bConstraintTypeInfo CTI_SPLINEIK = { CONSTRAINT_TYPE_SPLINEIK, /* type */ sizeof(bSplineIKConstraint), /* size */ - "Spline IK", /* name */ + N_("Spline IK"), /* name */ "bSplineIKConstraint", /* struct name */ splineik_free, /* free data */ splineik_id_looper, /* id looper */ @@ -4763,7 +4763,7 @@ static void pivotcon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *ta static bConstraintTypeInfo CTI_PIVOT = { CONSTRAINT_TYPE_PIVOT, /* type */ sizeof(bPivotConstraint), /* size */ - "Pivot", /* name */ + N_("Pivot"), /* name */ "bPivotConstraint", /* struct name */ NULL, /* free data */ pivotcon_id_looper, /* id looper */ @@ -5184,7 +5184,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase static bConstraintTypeInfo CTI_FOLLOWTRACK = { CONSTRAINT_TYPE_FOLLOWTRACK, /* type */ sizeof(bFollowTrackConstraint), /* size */ - "Follow Track", /* name */ + N_("Follow Track"), /* name */ "bFollowTrackConstraint", /* struct name */ NULL, /* free data */ followtrack_id_looper, /* id looper */ @@ -5242,7 +5242,7 @@ static void camerasolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase static bConstraintTypeInfo CTI_CAMERASOLVER = { CONSTRAINT_TYPE_CAMERASOLVER, /* type */ sizeof(bCameraSolverConstraint), /* size */ - "Camera Solver", /* name */ + N_("Camera Solver"), /* name */ "bCameraSolverConstraint", /* struct name */ NULL, /* free data */ camerasolver_id_looper, /* id looper */ @@ -5330,7 +5330,7 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase static bConstraintTypeInfo CTI_OBJECTSOLVER = { CONSTRAINT_TYPE_OBJECTSOLVER, /* type */ sizeof(bObjectSolverConstraint), /* size */ - "Object Solver", /* name */ + N_("Object Solver"), /* name */ "bObjectSolverConstraint", /* struct name */ NULL, /* free data */ objectsolver_id_looper, /* id looper */ @@ -5427,7 +5427,7 @@ static void transformcache_new_data(void *cdata) static bConstraintTypeInfo CTI_TRANSFORM_CACHE = { CONSTRAINT_TYPE_TRANSFORM_CACHE, /* type */ sizeof(bTransformCacheConstraint), /* size */ - "Transform Cache", /* name */ + N_("Transform Cache"), /* name */ "bTransformCacheConstraint", /* struct name */ transformcache_free, /* free data */ transformcache_id_looper, /* id looper */ -- cgit v1.2.3 From 3239cea726c7409f9fc6be53c078c3087a76c233 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Mon, 1 Aug 2022 14:09:41 +0200 Subject: I18n: make presets translatable Presets are used all over the Blender UI, but were so far untranslatable. This adds the translation code as well as a new `dump_preset_messages()` function in the message extraction. This goes over all bundled preset file names and extracts them. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D15570 --- .../modules/bl_i18n_utils/bl_extract_messages.py | 22 ++++++++++++++++++++++ release/scripts/modules/bl_i18n_utils/settings.py | 4 ++++ release/scripts/modules/bpy_types.py | 4 +++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index bfc111dd3c1..d7755532614 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -853,6 +853,25 @@ def dump_src_messages(msgs, reports, settings): dump_src_file(path, rel_path, msgs, reports, settings) +def dump_preset_messages(msgs, reports, settings): + files = [] + for dpath, _, fnames in os.walk(settings.PRESETS_DIR): + for fname in fnames: + if fname.startswith("_") or not fname.endswith(".py"): + continue + path = os.path.join(dpath, fname) + try: # can't always find the relative path (between drive letters on windows) + rel_path = os.path.relpath(path, settings.PRESETS_DIR) + except ValueError: + rel_path = path + files.append(rel_path) + for rel_path in files: + msgsrc, msgid = os.path.split(rel_path) + msgsrc = "Preset from " + msgsrc + msgid = bpy.path.display_name(msgid, title_case=False) + process_msg(msgs, settings.DEFAULT_CONTEXT, msgid, msgsrc, reports, None, settings) + + ##### Main functions! ##### def dump_messages(do_messages, do_checks, settings): bl_ver = "Blender " + bpy.app.version_string @@ -885,6 +904,9 @@ def dump_messages(do_messages, do_checks, settings): # Get strings from C source code. dump_src_messages(msgs, reports, settings) + # Get strings from presets. + dump_preset_messages(msgs, reports, settings) + # Get strings from addons' categories. for uid, label, tip in bpy.types.WindowManager.addon_filter.keywords['items']( bpy.context.window_manager, diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 3b69f8a6bf7..8d6d4fb5d3b 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -514,6 +514,9 @@ REL_GIT_I18N_PO_DIR = os.path.join("po") # The Blender source path to check for i18n macros (relative to SOURCE_DIR). REL_POTFILES_SOURCE_DIR = os.path.join("source") +# Where to search for preset names (relative to SOURCE_DIR). +REL_PRESETS_DIR = os.path.join("release", "scripts", "presets") + # The template messages file (relative to I18N_DIR). REL_FILE_NAME_POT = os.path.join(REL_BRANCHES_DIR, DOMAIN + ".pot") @@ -672,6 +675,7 @@ class I18nSettings: GIT_I18N_ROOT = property(*(_gen_get_set_path("SOURCE_DIR", "REL_GIT_I18N_DIR"))) GIT_I18N_PO_DIR = property(*(_gen_get_set_path("GIT_I18N_ROOT", "REL_GIT_I18N_PO_DIR"))) POTFILES_SOURCE_DIR = property(*(_gen_get_set_path("SOURCE_DIR", "REL_POTFILES_SOURCE_DIR"))) + PRESETS_DIR = property(*(_gen_get_set_path("SOURCE_DIR", "REL_PRESETS_DIR"))) FILE_NAME_POT = property(*(_gen_get_set_path("I18N_DIR", "REL_FILE_NAME_POT"))) MO_PATH_ROOT = property(*(_gen_get_set_path("I18N_DIR", "REL_MO_PATH_ROOT"))) MO_PATH_TEMPLATE = property(*(_gen_get_set_path("I18N_DIR", "REL_MO_PATH_TEMPLATE"))) diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index df0631ec26d..87b32eb1f40 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -1074,6 +1074,7 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta): - preset_operator_defaults (dict of keyword args) """ import bpy + from bpy.app.translations import pgettext_iface as iface_ ext_valid = getattr(self, "preset_extensions", {".py", ".xml"}) props_default = getattr(self, "preset_operator_defaults", None) add_operator = getattr(self, "preset_add_operator", None) @@ -1083,7 +1084,8 @@ class Menu(StructRNA, _GenericUI, metaclass=RNAMeta): props_default=props_default, filter_ext=lambda ext: ext.lower() in ext_valid, add_operator=add_operator, - display_name=lambda name: bpy.path.display_name(name, title_case=False) + display_name=lambda name: iface_( + bpy.path.display_name(name, title_case=False)) ) @classmethod -- cgit v1.2.3 From afd1357aa8c5dbfa15fedc79abe2fecb6f630fec Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 1 Aug 2022 14:36:06 +0200 Subject: tweaks & fixes to UI messages. --- release/scripts/modules/bl_i18n_utils/settings.py | 4 +++- release/scripts/modules/bl_i18n_utils/utils_spell_check.py | 1 + source/blender/makesrna/intern/rna_wm_gizmo.c | 2 +- source/blender/nodes/NOD_static_types.h | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 8d6d4fb5d3b..fb60b07a657 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -366,7 +366,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "all and invert unselected", "and AMD driver version 22.10 or newer", "and AMD Radeon Pro 21.Q4 driver or newer", - "and Linux driver version xx.xx.28000 or newer", + "and Linux driver version xx.xx.23570 or newer", "and NVIDIA driver version 470 or newer", "and Windows driver version 101.1660 or newer", "available with", @@ -396,11 +396,13 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "jumps over", "left", "local", + "matrices", "no matrices", "multi-res modifier", "non-triangle face", "normal", "or AMD with macOS 12.3 or newer", "performance impact!", + "positions", "no positions", "read", "remove", "right", 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 462c954d54a..a2fe2dd42ba 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -533,6 +533,7 @@ class SpellChecker: "tonemap", "toon", "transmissive", + "uvproject", "vividlight", "volumetrics", "voronoi", diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 0e307f5b424..4247b830efa 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -1402,7 +1402,7 @@ static void rna_def_gizmogroup(BlenderRNA *brna) "TOOL_FALLBACK_KEYMAP", 0, "Use fallback tools keymap", - "Add fallback tools keymap to this gizmo type."}, + "Add fallback tools keymap to this gizmo type"}, {WM_GIZMOGROUPTYPE_VR_REDRAWS, "VR_REDRAWS", 0, diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 1edb4e28d3a..586d3e36177 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -398,7 +398,7 @@ DefNode(GeometryNode, GEO_NODE_SUBDIVIDE_CURVE, 0, "SUBDIVIDE_CURVE", SubdivideC DefNode(GeometryNode, GEO_NODE_SUBDIVIDE_MESH, 0, "SUBDIVIDE_MESH", SubdivideMesh, "Subdivide Mesh", "Divide mesh faces into smaller ones without changing the shape or volume, using linear interpolation to place the new vertices") DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, def_geo_subdivision_surface, "SUBDIVISION_SURFACE",SubdivisionSurface, "Subdivision Surface","Divide mesh faces to form a smooth surface, using the Catmull-Clark subdivision method") DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "Switch between two inputs") -DefNode(GeometryNode, GEO_NODE_TRANSFER_ATTRIBUTE, def_geo_transfer_attribute, "ATTRIBUTE_TRANSFER", AttributeTransfer, "Transfer Attribute", "Retrieve values from a source geometry and provides them as a field by interpolating them with the context geomerty") +DefNode(GeometryNode, GEO_NODE_TRANSFER_ATTRIBUTE, def_geo_transfer_attribute, "ATTRIBUTE_TRANSFER", AttributeTransfer, "Transfer Attribute", "Retrieve values from a source geometry and provides them as a field by interpolating them with the context geometry") DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "Translate, rotate or scale the geometry") DefNode(GeometryNode, GEO_NODE_TRANSLATE_INSTANCES, 0, "TRANSLATE_INSTANCES",TranslateInstances, "Translate Instances","Move top-level geometry instances in local or global space") DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "Convert all faces in a mesh to triangular faces") -- cgit v1.2.3