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

Compositor: Clarify Alpha Over input names

Browse Source 
This patch renames the input of the Alpha Over node to use Background
and Foreground instead of just Image.

Pull Request: https://projects.blender.org/blender/blender/pulls/146352
This commit is contained in:
Omar Emara
2025-09-23 18:08:06 +02:00
committed by Omar Emara
parent bd07749a82
commit 9a2c7f334b
3 changed files with 14 additions and 3 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 86
#define BLENDER_FILE_SUBVERSION 87
/* 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

11
source/blender/blenloader/intern/versioning_500.cc
View File

@@ -3403,6 +3403,17 @@ void blo_do_versions_500(FileData *fd, Library * /*lib*/, Main *bmain)
FOREACH_NODETREE_END;
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 87)) {
FOREACH_NODETREE_BEGIN (bmain, node_tree, id) {
if (node_tree->type != NTREE_COMPOSIT) {
continue;
}
version_node_input_socket_name(node_tree, CMP_NODE_ALPHAOVER, "Image_001", "Foreground");
version_node_input_socket_name(node_tree, CMP_NODE_ALPHAOVER, "Image", "Background");
}
FOREACH_NODETREE_END;
}
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check.

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

@@ -41,8 +41,8 @@ static const EnumPropertyItem type_items[] = {
static void node_declare(NodeDeclarationBuilder &b)
{
b.is_function_node();
b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Color>("Image", "Image_001").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Color>("Background").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Color>("Foreground").default_value({1.0f, 1.0f, 1.0f, 1.0f});
b.add_input<decl::Float>("Fac").default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
b.add_input<decl::Menu>("Type")
.default_value(CMP_NODE_ALPHA_OVER_OPERATION_TYPE_OVER)