blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Matrix operations and sockets for geometry nodes #105408

Closed
Lukas Tönne wants to merge 37 commits from LukasTonne/blender:nodes-matrix-types into main
pull from: LukasTonne/blender:nodes-matrix-types
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 10 Commits 37 Files Changed 35 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9cd8342506 - Show all commits

4
source/blender/nodes/function/nodes/node_fn_combine_matrix.cc
View File

@ -156,10 +156,10 @@ static const fn::MultiFunction *get_multi_function(const bNode &bnode)
float m31,
float m32,
float m33,
float4x4 &result) {
float4x4 *result) {
const float elements[] = {
m00, m01, m02, m03, m10, m11, m12, m13, m20, m21, m22, m23, m30, m31, m32, m33};
result = float4x4(elements);
*result = float4x4(elements);
}};
switch (mode) {

2
source/blender/nodes/function/nodes/node_fn_matrix_math.cc
View File

@ -97,7 +97,7 @@ static const fn::MultiFunction *get_multi_function(NodeMatrixMathOperation op)
case NODE_MATRIX_MATH_ADD: {
static fn::CustomMF_SI_SI_SO<float4x4, float4x4, float4x4> fn{
"add",
[](const float4x4 &a, const float4x4 &b, float4x4 &r) { r = math::add(a, b); },
[](const float4x4 &a, const float4x4 &b) -> float4x4 { return math::add(a, b); },
exec_preset_fast};
return &fn;
}