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

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release')
m---------release/datafiles/locale0
-rw-r--r--release/datafiles/preview_grease_pencil.blendbin947876 -> 989580 bytes
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--release/scripts/modules/bl_i18n_utils/utils_spell_check.py6
-rw-r--r--release/scripts/startup/bl_operators/object.py2
-rw-r--r--release/scripts/startup/bl_ui/properties_particle.py4
7 files changed, 7 insertions, 5 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 1cc27d5282aa4978ee36663aca857eb550df194
+Subproject 72e5040232a544b293dca05dac5707bd4e4bffa
diff --git a/release/datafiles/preview_grease_pencil.blend b/release/datafiles/preview_grease_pencil.blend
index 82661d80029..46c90d8af08 100644
--- a/release/datafiles/preview_grease_pencil.blend
+++ b/release/datafiles/preview_grease_pencil.blend
Binary files differ
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 36cc6368b7abee3bc1a47759107797117eb7d53
+Subproject 8397b98b8cb6510869d28a84592b8d7213c3b6c
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 9468c406fb554e32ff47b62bfef356b3908ec65
+Subproject 7c36b48507f79ca62f8c038bad0fb3468c4f48e
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 738554e8f2c..aa80611ac6b 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -69,6 +69,7 @@ class SpellChecker:
"spacings",
"teleport", "teleporting",
"vertices",
+ "wasn", # wasn't
# Merged words
"antialiasing",
@@ -178,7 +179,7 @@ class SpellChecker:
"reinject", "reinjected",
"rekey",
"remesh",
- "reprojection", "reproject",
+ "reprojection", "reproject", "reprojecting",
"resize",
"restpose",
"retarget", "retargets", "retargeting", "retargeted",
@@ -569,7 +570,7 @@ class SpellChecker:
"shrinkwrap",
"softbody",
"stucci",
- "subsurf",
+ "subdiv",
"subtype",
"sunsky",
"tessface", "tessfaces",
@@ -654,6 +655,7 @@ class SpellChecker:
"dx",
"eo",
"fh",
+ "fk",
"fov",
"fft",
"futura",
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 12d7984b3b2..09a98100796 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -237,7 +237,7 @@ class SubdivisionSet(Operator):
)
relative: BoolProperty(
name="Relative",
- description=("Apply the subsurf level as an offset "
+ description=("Apply the subdivision surface level as an offset "
"relative to the current level"),
default=False,
)
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index cc8fa511e42..f1dd6a1c890 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -136,13 +136,13 @@ class PARTICLE_UL_particle_systems(bpy.types.UIList):
if md:
row.prop(
md,
- "show_render",
+ "show_viewport",
emboss=False,
icon_only=True,
)
row.prop(
md,
- "show_viewport",
+ "show_render",
emboss=False,
icon_only=True,
)