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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-05-12 22:55:33 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-12 22:57:04 +0300
commit5ca1eb96c7f2d078016ffda3f42067c57a0d06d3 (patch)
tree0a9da19f81c61e53955038b3ef79ba1df67a1bc5 /intern
parent289242fef912b0a51ca9b07972a304f651c6cc25 (diff)
parent829dce524dbbf34439422cd2906b94ce0e7920ed (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern')
-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 1439fb5a407..c437c6fda1e 100644
--- a/intern/cycles/graph/node.cpp
+++ b/intern/cycles/graph/node.cpp
@@ -133,7 +133,7 @@ void Node::set(const SocketType &input, const Transform &value)
void Node::set(const SocketType &input, Node *value)
{
- assert(input.type == SocketType::TRANSFORM);
+ assert(input.type == SocketType::NODE);
get_socket_value<Node *>(this, input) = value;
}
@@ -213,7 +213,7 @@ float Node::get_float(const SocketType &input) const
float2 Node::get_float2(const SocketType &input) const
{
- assert(input.type == SocketType::FLOAT);
+ assert(input.type == SocketType::POINT2);
return get_socket_value<float2>(this, input);
}
@@ -272,7 +272,7 @@ const array<float> &Node::get_float_array(const SocketType &input) const
const array<float2> &Node::get_float2_array(const SocketType &input) const
{
- assert(input.type == SocketType::FLOAT_ARRAY);
+ assert(input.type == SocketType::POINT2_ARRAY);
return get_socket_value<array<float2>>(this, input);
}