[Bf-blender-cvs] [34b670d0aa4] cycles_procedural_api: fix compile errors

[Kévin Dietrich]

Commit: 34b670d0aa4e9f366fc322558d0649dea391b5a2
Author: Kévin Dietrich
Date:   Mon Nov 2 01:25:21 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB34b670d0aa4e9f366fc322558d0649dea391b5a2

fix compile errors

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

M	intern/cycles/graph/node.h
M	intern/cycles/render/CMakeLists.txt
M	intern/cycles/render/scene.cpp
M	intern/cycles/render/scene.h

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

diff --git a/intern/cycles/graph/node.h b/intern/cycles/graph/node.h
index 5c5343f065b..6915318496f 100644
--- a/intern/cycles/graph/node.h
+++ b/intern/cycles/graph/node.h
@@ -184,11 +184,6 @@ struct Node {
     return (T &)*(((char *)node) + socket.struct_offset);
   }
 
-  template<typename T> static T &get_socket_value(const Node *node, const SocketType &socket)
-  {
-    return (T &)*(((char *)node) + socket.struct_offset);
-  }
-
   SocketModifiedFlags socket_modified;
 
   template<typename T> void set_if_different(const SocketType &input, T value);
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index ede10f585d3..fff0497feea 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -149,6 +149,10 @@ if(WITH_OPENVDB)
   )
 endif()
 
+list(APPEND LIB
+  ${ALEMBIC_LIBRARIES}
+)
+
 if(WITH_NANOVDB)
   list(APPEND INC_SYS
     ${NANOVDB_INCLUDE_DIRS}
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index fccb51508fb..a475981c230 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -795,4 +795,10 @@ template<> void Scene::delete_nodes(const set<Shader *> & /*nodes*/, const NodeO
   /* don't delete unused shaders, not supported */
 }
 
+template<> void Scene::delete_nodes(const set<Procedural *> &nodes, const NodeOwner *owner)
+{
+  remove_nodes_in_set(nodes, procedurals, owner);
+  procedural_manager->need_update = true;
+}
+
 CCL_NAMESPACE_END
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 9286e7814e4..0966d00c8d8 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -421,6 +421,8 @@ template<> void Scene::delete_nodes(const set<ParticleSystem *> &nodes, const No
 
 template<> void Scene::delete_nodes(const set<Shader *> &nodes, const NodeOwner *owner);
 
+template<> void Scene::delete_nodes(const set<Procedural *> &nodes, const NodeOwner *owner);
+
 CCL_NAMESPACE_END
 
 #endif /*  __SCENE_H__ */