blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

WIP: Fix #53574: Rename "Degr" socket of the Rotate compositing node to "Angle" #110637

Draft
Damien Picard wants to merge 1 commits from pioverfour/blender:dp_rename_degr_angle into main
pull from: pioverfour/blender:dp_rename_degr_angle
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 7 Commits 1 Files Changed 2 +9 -2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenloader/intern/versioning_300.cc
View File

@ -4530,5 +4530,12 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
*/
{
/* Keep this block, even when empty. */
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ntree->type == NTREE_COMPOSIT) {
version_node_socket_name(ntree, CMP_NODE_ROTATE, "Degr", "Angle");
}
}
FOREACH_NODETREE_END;
}
}

4
source/blender/nodes/composite/nodes/node_composite_rotate.cc
View File

@ -25,7 +25,7 @@ static void cmp_node_rotate_declare(NodeDeclarationBuilder &b)
b.add_input<decl::Color>("Image")
.default_value({1.0f, 1.0f, 1.0f, 1.0f})
.compositor_domain_priority(0);
b.add_input<decl::Float>("Degr")
b.add_input<decl::Float>("Angle")
.default_value(0.0f)
.min(-10000.0f)
.max(10000.0f)
@ -56,7 +56,7 @@ class RotateOperation : public NodeOperation {
Result &result = get_result("Image");
input.pass_through(result);
const math::AngleRadian rotation = get_input("Degr").get_float_value_default(0.0f);
const math::AngleRadian rotation = get_input("Angle").get_float_value_default(0.0f);
const float3x3 transformation = math::from_rotation<float3x3>(rotation);