[Bf-blender-cvs] [fa6e6ce1309] cycles_procedural_api: cleanup, remove dead code
Kévin Dietrich
noreply at git.blender.org
Fri Oct 9 17:56:04 CEST 2020
Commit: fa6e6ce13095f3cb81ff6b15c95deacca9b5fc80
Author: Kévin Dietrich
Date: Fri Oct 9 00:18:25 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rBfa6e6ce13095f3cb81ff6b15c95deacca9b5fc80
cleanup, remove dead code
===================================================================
M intern/cycles/graph/node.cpp
M intern/cycles/graph/node.h
===================================================================
diff --git a/intern/cycles/graph/node.cpp b/intern/cycles/graph/node.cpp
index 8a027033c39..ea0daec84b4 100644
--- a/intern/cycles/graph/node.cpp
+++ b/intern/cycles/graph/node.cpp
@@ -332,17 +332,6 @@ static void copy_array(const Node *node,
*dst = *src;
}
-template<typename T>
-static void steal_array(const Node *node,
- const SocketType &socket,
- const Node *other,
- const SocketType &other_socket)
-{
- array<T> *src = (array<T> *)(((char *)other) + other_socket.struct_offset);
- array<T> *dst = (array<T> *)(((char *)node) + socket.struct_offset);
- dst->steal_data(*src);
-}
-
void Node::copy_value(const SocketType &socket, const Node &other, const SocketType &other_socket)
{
assert(socket.type == other_socket.type);
diff --git a/intern/cycles/graph/node.h b/intern/cycles/graph/node.h
index 1ed82b410b0..b5543d4bb07 100644
--- a/intern/cycles/graph/node.h
+++ b/intern/cycles/graph/node.h
@@ -27,7 +27,6 @@ CCL_NAMESPACE_BEGIN
class MD5Hash;
struct Node;
struct NodeType;
-class Shader;
struct Transform;
/* Note: in the following macros we use "type const &" instead of "const type &"
@@ -133,7 +132,6 @@ struct Node {
const array<ustring> &get_string_array(const SocketType &input) const;
const array<Transform> &get_transform_array(const SocketType &input) const;
const array<Node *> &get_node_array(const SocketType &input) const;
- const array<Shader *> &get_shader_array(const SocketType &input) const;
/* generic values operations */
bool has_default_value(const SocketType &input) const;
More information about the Bf-blender-cvs
mailing list