Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Philipp Oeser
2020-04-29 11:44:56 +02:00
parent 157f836493 2845b232a7
commit 980cebc459
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/modules/bl_i18n_utils/settings.py
View File

@@ -377,7 +377,6 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"normal", "normal",
"right", "right",
"the lazy dog", "the lazy dog",
"trunc(A)",
"unable to load movie clip", "unable to load movie clip",
"unable to load text", "unable to load text",
"unable to open the file", "unable to open the file",

2
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -203,7 +203,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = {
"Round A to the nearest integer. Round upward if the fraction part is 0.5"}, "Round A to the nearest integer. Round upward if the fraction part is 0.5"},
{NODE_MATH_FLOOR, "FLOOR", 0, "Floor", "The largest integer smaller than or equal A"}, {NODE_MATH_FLOOR, "FLOOR", 0, "Floor", "The largest integer smaller than or equal A"},
{NODE_MATH_CEIL, "CEIL", 0, "Ceil", "The smallest integer greater than or equal A"}, {NODE_MATH_CEIL, "CEIL", 0, "Ceil", "The smallest integer greater than or equal A"},
{NODE_MATH_TRUNC, "TRUNC", 0, "Truncate", "trunc(A)"}, {NODE_MATH_TRUNC, "TRUNC", 0, "Truncate", "The integer part of A, removing fractional digits"},
{0, "", ICON_NONE, NULL, NULL}, {0, "", ICON_NONE, NULL, NULL},
{NODE_MATH_FRACTION, "FRACT", 0, "Fraction", "The fraction part of A"}, {NODE_MATH_FRACTION, "FRACT", 0, "Fraction", "The fraction part of A"},
{NODE_MATH_MODULO, "MODULO", 0, "Modulo", "Modulo using fmod(A,B)"}, {NODE_MATH_MODULO, "MODULO", 0, "Modulo", "Modulo using fmod(A,B)"},