Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/nodes/intern/node_util.c')
-rw-r--r--source/blender/nodes/intern/node_util.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c
index a5d61332a90..123347afc19 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -435,6 +435,22 @@ static int node_datatype_priority(eNodeSocketDatatype from, eNodeSocketDatatype
default:
return -1;
}
+ case SOCK_OBJECT: {
+ switch (from) {
+ case SOCK_OBJECT:
+ return 1;
+ default:
+ return -1;
+ }
+ }
+ case SOCK_GEOMETRY: {
+ switch (from) {
+ case SOCK_GEOMETRY:
+ return 1;
+ default:
+ return -1;
+ }
+ }
default:
return -1;
}