[Bf-blender-cvs] [2db2afeeb68] temp-node-tree-pages-prototype: Merge branch 'master' into temp-node-tree-pages-prototype

[Jacques Lucke]

Commit: 2db2afeeb68b2e6a15b4b0d1276ca6184f8b8256
Author: Jacques Lucke
Date:   Wed Mar 31 16:33:16 2021 +0200
Branches: temp-node-tree-pages-prototype
https://developer.blender.org/rB2db2afeeb68b2e6a15b4b0d1276ca6184f8b8256

Merge branch 'master' into temp-node-tree-pages-prototype

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 1b931bf963e,7e887caf3f2..c2417b714ed
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -561,11 -564,7 +564,9 @@@ geometry_node_categories = 
      GeometryNodeCategory("GEO_LAYOUT", "Layout", items=[
          NodeItem("NodeFrame"),
          NodeItem("NodeReroute"),
 +        NodeItem("NodePortalIn"),
 +        NodeItem("NodePortalOut"),
      ]),
-     # NodeItem("FunctionNodeCombineStrings"),
-     # NodeItem("FunctionNodeGroupInstanceID"),
  ]
  
  
diff --cc source/blender/nodes/NOD_node_tree_ref.hh
index 14bb708bdff,3710bd2fe00..df166c6339c
--- a/source/blender/nodes/NOD_node_tree_ref.hh
+++ b/source/blender/nodes/NOD_node_tree_ref.hh
@@@ -169,8 -177,10 +177,12 @@@ class NodeRef : NonCopyable, NonMovabl
    bool is_group_input_node() const;
    bool is_group_output_node() const;
    bool is_muted() const;
+   bool is_frame() const;
 +  bool is_portal_in() const;
 +  bool is_portal_out() const;
+ 
+   void *storage() const;
+   template<typename T> T *storage() const;
  };
  
  class LinkRef : NonCopyable, NonMovable {
@@@ -514,16 -541,16 +548,26 @@@ inline bool NodeRef::is_muted() cons
    return (bnode_->flag & NODE_MUTED) != 0;
  }
  
 +inline bool NodeRef::is_portal_in() const
 +{
 +  return bnode_->type == NODE_PORTAL_IN;
 +}
 +
 +inline bool NodeRef::is_portal_out() const
 +{
 +  return bnode_->type == NODE_PORTAL_OUT;
 +}
 +
+ inline void *NodeRef::storage() const
+ {
+   return bnode_->storage;
+ }
+ 
+ template<typename T> inline T *NodeRef::storage() const
+ {
+   return (T *)bnode_->storage;
+ }
+ 
  /* --------------------------------------------------------------------
   * LinkRef inline methods.
   */