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:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2020-10-09 01:04:48 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2020-10-09 01:15:24 +0300
commit70634ba43855030e9229e6d5c51ca58af1728f3c (patch)
tree3d173b6f1fdeecfaae1212d15478bb427f99ab5e /intern/cycles/graph
parent3fae33b22cb0d6afd5c8dcd5373e12d83f35090f (diff)
Cycles: fix incorrect asserts in node socket set functions
Diffstat (limited to 'intern/cycles/graph')
-rw-r--r--intern/cycles/graph/node.cpp6
1 files changed, 3 insertions, 3 deletions
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);
}