blender
/
blender
134
421
Fork 604
Code Issues 6.4k Pull Requests 769 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 +7 -3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0e2be8a6e7 - Show all commits

2
release/datafiles/assets

@ -1 +1 @@
Subproject commit 1d44611dd36032c1889c66d673801ef7d699f592
Subproject commit 3a36a5abc7b8866fe1e4d23ddea9aed1ff01c80d

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

@ -752,6 +752,8 @@ static bool reduce_binary(const BinaryConstraintFn &constraint,
}
struct NullLogger {
static void set_variable_names(FunctionRef<std::string(int)> /*names_fn*/) {}
static void notify(StringRef /*message*/) {}
static void on_worklist_extended(const int /*var_src*/, const int /*var_dst*/) {}
@ -762,6 +764,8 @@ struct NullLogger {
};
struct PrintLogger {
static void set_variable_names(FunctionRef<std::string(int)> names_fn) {}
static void notify(StringRef message)
{
std::cout << message << std::endl;
@ -777,7 +781,7 @@ struct PrintLogger {
std::cout << " Applying " << src << ", " << dst << std::endl;
}
static void on_domain_reduced(const int var, const BitSpan domain)
static void on_domain_reduced(const int /*var*/, const BitSpan /*domain*/)
{
std::cout << " Reduced domain!" << std::endl;
}

2
tests/data

@ -1 +1 @@
Subproject commit 2b4830f9a80c6e74c6012a9d7811de91bc8565b2
Subproject commit 15c20a4b5d40dfbb1f64c65d898ea22ab00b1f1a