griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compositor: Remove Relative option from Translate node

Browse Source 
This patch removes the Relative option from the Translate node. This is
now superseded by the Relative To Pixel node, and removal was done to
facilitate the options to inputs project.

Pull Request: https://projects.blender.org/blender/blender/pulls/139147
This commit is contained in:
Omar Emara
2025-05-20 16:05:07 +02:00
committed by Omar Emara
parent 44160a0524
commit aa6a0638ff
4 changed files with 133 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -27,7 +27,7 @@
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 73
#define BLENDER_FILE_SUBVERSION 74
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and cancel loading the file, showing a warning to

128
source/blender/blenloader/intern/versioning_450.cc
View File

@@ -3503,6 +3503,125 @@ static void version_escape_curly_braces_in_compositor_file_output_nodes(bNodeTre
}
}
/* The Relative option was removed. Insert Relative To Pixel nodes for the X and Y inputs to
* convert relative values to pixel values. */
static void do_version_translate_node_remove_relative(bNodeTree *node_tree)
{
LISTBASE_FOREACH (bNode *, node, &node_tree->nodes) {
if (!STREQ(node->idname, "CompositorNodeTranslate")) {
continue;
}
const NodeTranslateData *data = static_cast<NodeTranslateData *>(node->storage);
if (!bool(data->relative)) {
continue;
}
/* Find links going into the node. */
bNodeLink *image_link = nullptr;
bNodeLink *x_link = nullptr;
bNodeLink *y_link = nullptr;
LISTBASE_FOREACH (bNodeLink *, link, &node_tree->links) {
if (link->tonode != node) {
continue;
}
if (blender::StringRef(link->tosock->identifier) == "Image") {
image_link = link;
}
if (blender::StringRef(link->tosock->identifier) == "X") {
x_link = link;
}
if (blender::StringRef(link->tosock->identifier) == "Y") {
y_link = link;
}
}
/* Image input is unlinked, so the node does nothing. */
if (!image_link) {
continue;
}
/* Add a Relative To Pixel node, assign it the input of the X translation and connect it to the
* X translation input. */
bNode *x_relative_to_pixel_node = blender::bke::node_add_node(
nullptr, *node_tree, "CompositorNodeRelativeToPixel");
x_relative_to_pixel_node->parent = node->parent;
x_relative_to_pixel_node->location[0] = node->location[0] - node->width - 20.0f;
x_relative_to_pixel_node->location[1] = node->location[1];
x_relative_to_pixel_node->custom1 = CMP_NODE_RELATIVE_TO_PIXEL_DATA_TYPE_FLOAT;
x_relative_to_pixel_node->custom2 = CMP_NODE_RELATIVE_TO_PIXEL_REFERENCE_DIMENSION_X;
bNodeSocket *x_image_input = blender::bke::node_find_socket(
*x_relative_to_pixel_node, SOCK_IN, "Image");
bNodeSocket *x_value_input = blender::bke::node_find_socket(
*x_relative_to_pixel_node, SOCK_IN, "Float Value");
bNodeSocket *x_value_output = blender::bke::node_find_socket(
*x_relative_to_pixel_node, SOCK_OUT, "Float Value");
bNodeSocket *x_input = blender::bke::node_find_socket(*node, SOCK_IN, "X");
x_value_input->default_value_typed<bNodeSocketValueFloat>()->value =
x_input->default_value_typed<bNodeSocketValueFloat>()->value;
version_node_add_link(*node_tree, *x_relative_to_pixel_node, *x_value_output, *node, *x_input);
version_node_add_link(*node_tree,
*image_link->fromnode,
*image_link->fromsock,
*x_relative_to_pixel_node,
*x_image_input);
if (x_link) {
version_node_add_link(*node_tree,
*x_link->fromnode,
*x_link->fromsock,
*x_relative_to_pixel_node,
*x_value_input);
blender::bke::node_remove_link(node_tree, *x_link);
}
/* Add a Relative To Pixel node, assign it the input of the Y translation and connect it to the
* Y translation input. */
bNode *y_relative_to_pixel_node = blender::bke::node_add_node(
nullptr, *node_tree, "CompositorNodeRelativeToPixel");
y_relative_to_pixel_node->parent = node->parent;
y_relative_to_pixel_node->location[0] = node->location[0] - node->width - 20.0f;
y_relative_to_pixel_node->location[1] = node->location[1] - 20.0f;
y_relative_to_pixel_node->custom1 = CMP_NODE_RELATIVE_TO_PIXEL_DATA_TYPE_FLOAT;
y_relative_to_pixel_node->custom2 = CMP_NODE_RELATIVE_TO_PIXEL_REFERENCE_DIMENSION_Y;
bNodeSocket *y_image_input = blender::bke::node_find_socket(
*y_relative_to_pixel_node, SOCK_IN, "Image");
bNodeSocket *y_value_input = blender::bke::node_find_socket(
*y_relative_to_pixel_node, SOCK_IN, "Float Value");
bNodeSocket *y_value_output = blender::bke::node_find_socket(
*y_relative_to_pixel_node, SOCK_OUT, "Float Value");
bNodeSocket *y_input = blender::bke::node_find_socket(*node, SOCK_IN, "Y");
y_value_input->default_value_typed<bNodeSocketValueFloat>()->value =
y_input->default_value_typed<bNodeSocketValueFloat>()->value;
version_node_add_link(*node_tree, *y_relative_to_pixel_node, *y_value_output, *node, *y_input);
version_node_add_link(*node_tree,
*image_link->fromnode,
*image_link->fromsock,
*y_relative_to_pixel_node,
*y_image_input);
if (y_link) {
version_node_add_link(*node_tree,
*y_link->fromnode,
*y_link->fromsock,
*y_relative_to_pixel_node,
*y_value_input);
blender::bke::node_remove_link(node_tree, *y_link);
}
}
}
void do_versions_after_linking_450(FileData * /*fd*/, Main *bmain)
{
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 405, 8)) {
@@ -5185,6 +5304,15 @@ void blo_do_versions_450(FileData * /*fd*/, Library * /*lib*/, Main *bmain)
}
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 405, 74)) {
FOREACH_NODETREE_BEGIN (bmain, node_tree, id) {
if (node_tree->type == NTREE_COMPOSIT) {
do_version_translate_node_remove_relative(node_tree);
}
}
FOREACH_NODETREE_END;
}
/* Always run this versioning (keep at the bottom of the function). Meshes are written with the
* legacy format which always needs to be converted to the new format on file load. To be moved
* to a subversion check in 5.0. */

8
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -10497,10 +10497,10 @@ static void def_cmp_translate(BlenderRNA * /*brna*/, StructRNA *srna)
prop = RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "relative", 1);
RNA_def_property_ui_text(
prop,
"Relative",
"Use relative (fraction of input image size) values to define translation");
RNA_def_property_ui_text(prop,
"Relative",
"Use relative (fraction of input image size) values to define "
"translation. (Deprecated: Unused.)");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "wrap_axis", PROP_ENUM, PROP_NONE);

11
source/blender/nodes/composite/nodes/node_composite_translate.cc
View File

@@ -52,7 +52,6 @@ static void node_composit_buts_translate(uiLayout *layout, bContext * /*C*/, Poi
{
layout->prop(ptr, "interpolation", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
layout->prop(ptr, "wrap_axis", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
layout->prop(ptr, "use_relative", UI_ITEM_R_SPLIT_EMPTY_NAME, std::nullopt, ICON_NONE);
}
using namespace blender::compositor;
@@ -67,11 +66,6 @@ class TranslateOperation : public NodeOperation {
float x = this->get_input("X").get_single_value_default(0.0f);
float y = this->get_input("Y").get_single_value_default(0.0f);
if (this->get_use_relative()) {
x *= input.domain().size.x;
y *= input.domain().size.y;
}
const float2 translation = float2(x, y);
Result &output = this->get_result("Image");
@@ -97,11 +91,6 @@ class TranslateOperation : public NodeOperation {
return Interpolation::Nearest;
}
bool get_use_relative()
{
return node_storage(bnode()).relative;
}
bool get_repeat_x()
{
return ELEM(node_storage(bnode()).wrap_axis,