Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / nodes / deg_node_component.h
index 9be5388e69f2dffae35b8a4580bc7a007929742c..ba4f8551fea0f7254f978726aca1c2f9eb431e87 100644 (file)
@@ -74,18 +74,26 @@ struct ComponentDepsNode : public DepsNode {
 
        string identifier() const;
 
-       /* Find an existing operation, will throw an assert() if it does not exist. */
+       /* Find an existing operation, if requested operation does not exist
+        * NULL will be returned.
+        */
        OperationDepsNode *find_operation(OperationIDKey key) const;
        OperationDepsNode *find_operation(eDepsOperation_Code opcode,
-                                         const char *name,
-                                         int name_tag) const;
+                                        const char *name,
+                                        int name_tag) const;
 
-       /* Check operation exists and return it. */
-       OperationDepsNode *has_operation(OperationIDKey key) const;
-       OperationDepsNode *has_operation(eDepsOperation_Code opcode,
+       /* Find an existing operation, will throw an assert() if it does not exist. */
+       OperationDepsNode *get_operation(OperationIDKey key) const;
+       OperationDepsNode *get_operation(eDepsOperation_Code opcode,
                                         const char *name,
                                         int name_tag) const;
 
+       /* Check operation exists and return it. */
+       bool has_operation(OperationIDKey key) const;
+       bool has_operation(eDepsOperation_Code opcode,
+                          const char *name,
+                          int name_tag) const;
+
        /**
         * Create a new node for representing an operation and add this to graph
         * \warning If an existing node is found, it will be modified. This helps