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

Geometry Nodes: treat rotation as vector data type in link-drag-search in some nodes

Browse Source 
If there is implicit conversion between rotation and vector type, so these search items
make sense.

Pull Request: https://projects.blender.org/blender/blender/pulls/121754
This commit is contained in:
Iliya Katueshenock
2024-05-20 20:30:52 +02:00
committed by Jacques Lucke
parent f181027f6b
commit 1904e2fc8d
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/nodes/function/nodes/node_fn_random_value.cc
View File

@@ -99,6 +99,7 @@ static std::optional<eCustomDataType> node_type_from_other_socket(const bNodeSoc
return CD_PROP_INT32;
case SOCK_VECTOR:
case SOCK_RGBA:
case SOCK_ROTATION:
return CD_PROP_FLOAT3;
default:
return {};

1
source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc
View File

@@ -91,6 +91,7 @@ static std::optional<eCustomDataType> node_type_from_other_socket(const bNodeSoc
return CD_PROP_INT32;
case SOCK_VECTOR:
case SOCK_RGBA:
case SOCK_ROTATION:
return CD_PROP_FLOAT3;
default:
return {};

1
source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc
View File

@@ -63,6 +63,7 @@ static std::optional<eCustomDataType> node_type_from_other_socket(const bNodeSoc
return CD_PROP_FLOAT;
case SOCK_VECTOR:
case SOCK_RGBA:
case SOCK_ROTATION:
return CD_PROP_FLOAT3;
default:
return {};

3
source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc
View File

@@ -85,8 +85,7 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
return;
}
if (fixed_data_type == CD_PROP_QUATERNION) {
/* Don't implement quaternion blurring for now. */
return;
fixed_data_type = CD_PROP_FLOAT3;
}
if (fixed_data_type == CD_PROP_FLOAT4X4) {
/* Don't implement matrix blurring for now. */