[Bf-blender-cvs] [70634ba4385] master: Cycles: fix incorrect asserts in node socket set functions

[Kévin Dietrich]

Commit: 70634ba43855030e9229e6d5c51ca58af1728f3c
Author: Kévin Dietrich
Date:   Fri Oct 9 00:04:48 2020 +0200
Branches: master
https://developer.blender.org/rB70634ba43855030e9229e6d5c51ca58af1728f3c

Cycles: fix incorrect asserts in node socket set functions

===================================================================

M       intern/cycles/graph/node.cpp

===================================================================

diff --git a/intern/cycles/graph/node.cpp b/intern/cycles/graph/node.cpp
index 4d32d52aa83..f239040ee3d 100644
--- a/intern/cycles/graph/node.cpp
+++ b/intern/cycles/graph/node.cpp
@@ -98,7 +98,7 @@ void Node::set(const SocketType &input, float value)
 
 void Node::set(const SocketType &input, float2 value)
 {
-  assert(input.type == SocketType::FLOAT);
+  assert(input.type == SocketType::POINT2);
   set_if_different(input, value);
 }
 
@@ -165,7 +165,7 @@ void Node::set(const SocketType &input, array<float> &value)
 
 void Node::set(const SocketType &input, array<float2> &value)
 {
-  assert(input.type == SocketType::FLOAT_ARRAY);
+  assert(input.type == SocketType::POINT2_ARRAY);
   set_if_different(input, value);
 }
 
@@ -189,7 +189,7 @@ void Node::set(const SocketType &input, array<Transform> 
&value)
 
 void Node::set(const SocketType &input, array<Node *> &value)
 {
-  assert(input.type == SocketType::TRANSFORM_ARRAY);
+  assert(input.type == SocketType::NODE_ARRAY);
   set_if_different(input, value);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs