[Bf-blender-cvs] [b924252ded6] cycles_procedural_api: Merge branch 'master' into cycles_procedural_api

[Kévin Dietrich]

Commit: b924252ded6b0fe1ff13d41a059167938944badc
Author: Kévin Dietrich
Date:   Mon Oct 26 23:26:09 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rBb924252ded6b0fe1ff13d41a059167938944badc

Merge branch 'master' into cycles_procedural_api

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



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

diff --cc intern/cycles/graph/node.h
index 6915318496f,b28ea09282b..5c5343f065b
--- a/intern/cycles/graph/node.h
+++ b/intern/cycles/graph/node.h
@@@ -177,13 -174,12 +177,18 @@@ struct Node 
  
   protected:
    const NodeOwner *owner;
 +  int time_stamp;
 +
 +  template<typename T> static T &get_socket_value(const Node *node, const SocketType &socket)
 +  {
 +    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);