blender
/
blender
137
418
Fork 600
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

WIP: Field type inferencing using a constraint solver method #120420

Draft
Lukas Tönne wants to merge 52 commits from LukasTonne/blender:socket-type-inference into main
pull from: LukasTonne/blender:socket-type-inference
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 52 Files Changed 14 +12
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1f482030c1 - Show all commits

12
source/blender/blenkernel/intern/node_tree_field_inferencing.cc
View File

@ -929,6 +929,10 @@ static bool verify_field_inferencing_csp_result(
};
const int var_index = socket_vars[socket->index_in_tree()];
const BitSpan state = csp_result[var_index];
if (!state[DomainValue::Single] && !state[DomainValue::Field]) {
log_error("ERROR: neither single value nor field");
continue;
}
const SocketFieldState &old_state = field_state_by_socket_id[socket->index_in_tree()];
if (old_state.is_always_single) {
if (!state[DomainValue::Single] || state[DomainValue::Field]) {
@ -960,6 +964,10 @@ static bool verify_field_inferencing_csp_result(
};
const int var_index = tree_input_vars[i];
const BitSpan state = csp_result[var_index];
if (!state[DomainValue::Single] && !state[DomainValue::Field]) {
log_error("ERROR: neither single value nor field");
continue;
}
const InputSocketFieldType &old_state = tmp_inferencing_interface->inputs[i];
switch (old_state) {
case InputSocketFieldType::None:
@ -982,6 +990,10 @@ static bool verify_field_inferencing_csp_result(
};
const int var_index = tree_output_vars[i];
const BitSpan state = csp_result[var_index];
if (!state[DomainValue::Single] && !state[DomainValue::Field]) {
log_error("ERROR: neither single value nor field");
continue;
}
const OutputFieldDependency &old_state = tmp_inferencing_interface->outputs[i];
switch (old_state.field_type()) {
case OutputSocketFieldType::None: