Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4096bcfb25 - Show all commits

2
source/blender/editors/space_node/link_drag_search.cc
View File

@ -309,7 +309,7 @@ static void gather_socket_link_operations(const bContext &C,
continue; continue;
} }
search_link_ops.append( search_link_ops.append(
{std::string(IFACE_("Group Input ")) + UI_MENU_ARROW_SEP + interface_socket->name, {std::string(IFACE_("Group Input")) + " " + UI_MENU_ARROW_SEP + interface_socket->name,
[interface_socket](nodes::LinkSearchOpParams &params) { [interface_socket](nodes::LinkSearchOpParams &params) {
add_existing_group_input_fn(params, *interface_socket); add_existing_group_input_fn(params, *interface_socket);
}, },

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

@ -167,7 +167,7 @@ static const EnumPropertyItem rna_enum_vector_rotate_type_items[] = {
}; };
const EnumPropertyItem rna_enum_node_math_items[] = { const EnumPropertyItem rna_enum_node_math_items[] = {
RNA_ENUM_ITEM_HEADING(N_("Functions"), NULL), RNA_ENUM_ITEM_HEADING(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "Functions"), NULL),
{NODE_MATH_ADD, "ADD", 0, "Add", "A + B"}, {NODE_MATH_ADD, "ADD", 0, "Add", "A + B"},
{NODE_MATH_SUBTRACT, "SUBTRACT", 0, "Subtract", "A - B"}, {NODE_MATH_SUBTRACT, "SUBTRACT", 0, "Subtract", "A - B"},
{NODE_MATH_MULTIPLY, "MULTIPLY", 0, "Multiply", "A * B"}, {NODE_MATH_MULTIPLY, "MULTIPLY", 0, "Multiply", "A * B"},
@ -180,7 +180,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = {
{NODE_MATH_INV_SQRT, "INVERSE_SQRT", 0, "Inverse Square Root", "1 / Square root of A"}, {NODE_MATH_INV_SQRT, "INVERSE_SQRT", 0, "Inverse Square Root", "1 / Square root of A"},
{NODE_MATH_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Magnitude of A"}, {NODE_MATH_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Magnitude of A"},
{NODE_MATH_EXPONENT, "EXPONENT", 0, "Exponent", "exp(A)"}, {NODE_MATH_EXPONENT, "EXPONENT", 0, "Exponent", "exp(A)"},
RNA_ENUM_ITEM_HEADING(N_("Comparison"), NULL), RNA_ENUM_ITEM_HEADING(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "Comparison"), NULL),
{NODE_MATH_MINIMUM, "MINIMUM", 0, "Minimum", "The minimum from A and B"}, {NODE_MATH_MINIMUM, "MINIMUM", 0, "Minimum", "The minimum from A and B"},
{NODE_MATH_MAXIMUM, "MAXIMUM", 0, "Maximum", "The maximum from A and B"}, {NODE_MATH_MAXIMUM, "MAXIMUM", 0, "Maximum", "The maximum from A and B"},
{NODE_MATH_LESS_THAN, "LESS_THAN", 0, "Less Than", "1 if A < B else 0"}, {NODE_MATH_LESS_THAN, "LESS_THAN", 0, "Less Than", "1 if A < B else 0"},
@ -197,7 +197,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = {
0, 0,
"Smooth Maximum", "Smooth Maximum",
"The maximum from A and B with smoothing C"}, "The maximum from A and B with smoothing C"},
RNA_ENUM_ITEM_HEADING(N_("Rounding"), NULL), RNA_ENUM_ITEM_HEADING(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "Rounding"), NULL),
{NODE_MATH_ROUND, {NODE_MATH_ROUND,
"ROUND", "ROUND",
0, 0,
@ -216,7 +216,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = {
0, 0,
"Ping-Pong", "Ping-Pong",
"Wraps a value and reverses every other cycle (A,B)"}, "Wraps a value and reverses every other cycle (A,B)"},
RNA_ENUM_ITEM_HEADING(N_("Trigonometric"), NULL), RNA_ENUM_ITEM_HEADING(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "Trigonometric"), NULL),
{NODE_MATH_SINE, "SINE", 0, "Sine", "sin(A)"}, {NODE_MATH_SINE, "SINE", 0, "Sine", "sin(A)"},
{NODE_MATH_COSINE, "COSINE", 0, "Cosine", "cos(A)"}, {NODE_MATH_COSINE, "COSINE", 0, "Cosine", "cos(A)"},
{NODE_MATH_TANGENT, "TANGENT", 0, "Tangent", "tan(A)"}, {NODE_MATH_TANGENT, "TANGENT", 0, "Tangent", "tan(A)"},
@ -229,7 +229,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = {
{NODE_MATH_SINH, "SINH", 0, "Hyperbolic Sine", "sinh(A)"}, {NODE_MATH_SINH, "SINH", 0, "Hyperbolic Sine", "sinh(A)"},
{NODE_MATH_COSH, "COSH", 0, "Hyperbolic Cosine", "cosh(A)"}, {NODE_MATH_COSH, "COSH", 0, "Hyperbolic Cosine", "cosh(A)"},
{NODE_MATH_TANH, "TANH", 0, "Hyperbolic Tangent", "tanh(A)"}, {NODE_MATH_TANH, "TANH", 0, "Hyperbolic Tangent", "tanh(A)"},
RNA_ENUM_ITEM_HEADING(N_("Conversion"), NULL), RNA_ENUM_ITEM_HEADING(CTX_N_(BLT_I18NCONTEXT_ID_NODETREE, "Conversion"), NULL),
{NODE_MATH_RADIANS, "RADIANS", 0, "To Radians", "Convert from degrees to radians"}, {NODE_MATH_RADIANS, "RADIANS", 0, "To Radians", "Convert from degrees to radians"},
{NODE_MATH_DEGREES, "DEGREES", 0, "To Degrees", "Convert from radians to degrees"}, {NODE_MATH_DEGREES, "DEGREES", 0, "To Degrees", "Convert from radians to degrees"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},