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

UI: Nodes: Rename Levels node "Std Dev" output to "Standard Deviation"

Browse Source 
This commit renames the Compositor Levels node output socket from
"Std Dev" to "Standard Deviation". This is a 5.0 breaking change,
following up on PR #140498, #140495 and #96219

Pull Request: https://projects.blender.org/blender/blender/pulls/140500
This commit is contained in:
Jonas Holzman
2025-06-17 10:36:55 +02:00
parent 20db37a37f
commit dce3ce7a04
3 changed files with 13 additions and 4 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 12
#define BLENDER_FILE_SUBVERSION 13
/* 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

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

@@ -195,6 +195,15 @@ void blo_do_versions_500(FileData * /*fd*/, Library * /*lib*/, Main *bmain)
}
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 13)) {
FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
if (ntree->type == NTREE_COMPOSIT) {
version_node_socket_name(ntree, CMP_NODE_VIEW_LEVELS, "Std Dev", "Standard Deviation");
}
}
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.

6
source/blender/nodes/composite/nodes/node_composite_levels.cc
View File

@@ -32,7 +32,7 @@ static void cmp_node_levels_declare(NodeDeclarationBuilder &b)
.default_value({0.0f, 0.0f, 0.0f, 1.0f})
.compositor_domain_priority(0);
b.add_output<decl::Float>("Mean");
b.add_output<decl::Float>("Std Dev");
b.add_output<decl::Float>("Standard Deviation");
}
static void node_composit_init_view_levels(bNodeTree * /*ntree*/, bNode *node)
@@ -69,7 +69,7 @@ class LevelsOperation : public NodeOperation {
mean_result.set_single_value(mean);
}
Result &standard_deviation_result = get_result("Std Dev");
Result &standard_deviation_result = get_result("Standard Deviation");
if (standard_deviation_result.should_compute()) {
const float standard_deviation = compute_standard_deviation(mean);
standard_deviation_result.allocate_single_value();
@@ -79,7 +79,7 @@ class LevelsOperation : public NodeOperation {
void execute_single_value()
{
Result &standard_deviation_result = get_result("Std Dev");
Result &standard_deviation_result = get_result("Standard Deviation");
if (standard_deviation_result.should_compute()) {
standard_deviation_result.allocate_single_value();
standard_deviation_result.set_single_value(0.0f);