archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2017-06-13 15:11:58 +02:00
parent 4577bda634 6becdf5d00
commit 7cfa6094ab
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -183,7 +183,7 @@ ComponentDepsNode *DepsgraphNodeBuilder::add_component_node(
OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( OperationDepsNode *DepsgraphNodeBuilder::add_operation_node(
ComponentDepsNode *comp_node, ComponentDepsNode *comp_node,
DepsEvalOperationCb op, const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name, const char *name,
int name_tag) int name_tag)
@@ -210,7 +210,7 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node(
ID *id, ID *id,
eDepsNode_Type comp_type, eDepsNode_Type comp_type,
const char *comp_name, const char *comp_name,
DepsEvalOperationCb op, const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name, const char *name,
int name_tag) int name_tag)
@@ -222,7 +222,7 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node(
OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( OperationDepsNode *DepsgraphNodeBuilder::add_operation_node(
ID *id, ID *id,
eDepsNode_Type comp_type, eDepsNode_Type comp_type,
DepsEvalOperationCb op, const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name, const char *name,
int name_tag) int name_tag)

6
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
View File

@@ -81,20 +81,20 @@ struct DepsgraphNodeBuilder {
const char *comp_name = ""); const char *comp_name = "");
OperationDepsNode *add_operation_node(ComponentDepsNode *comp_node, OperationDepsNode *add_operation_node(ComponentDepsNode *comp_node,
DepsEvalOperationCb op, const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name = "", const char *name = "",
int name_tag = -1); int name_tag = -1);
OperationDepsNode *add_operation_node(ID *id, OperationDepsNode *add_operation_node(ID *id,
eDepsNode_Type comp_type, eDepsNode_Type comp_type,
const char *comp_name, const char *comp_name,
DepsEvalOperationCb op, const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name = "", const char *name = "",
int name_tag = -1); int name_tag = -1);
OperationDepsNode *add_operation_node(ID *id, OperationDepsNode *add_operation_node(ID *id,
eDepsNode_Type comp_type, eDepsNode_Type comp_type,
DepsEvalOperationCb op, const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name = "", const char *name = "",
int name_tag = -1); int name_tag = -1);

2
source/blender/depsgraph/intern/nodes/deg_node_component.cc
View File

@@ -194,7 +194,7 @@ OperationDepsNode *ComponentDepsNode::has_operation(eDepsOperation_Code opcode,
return has_operation(key); return has_operation(key);
} }
OperationDepsNode *ComponentDepsNode::add_operation(DepsEvalOperationCb op, OperationDepsNode *ComponentDepsNode::add_operation(const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name, const char *name,
int name_tag) int name_tag)

2
source/blender/depsgraph/intern/nodes/deg_node_component.h
View File

@@ -99,7 +99,7 @@ struct ComponentDepsNode : public DepsNode {
* \param op: The operation to perform * \param op: The operation to perform
* \param name: Identifier for operation - used to find/locate it again * \param name: Identifier for operation - used to find/locate it again
*/ */
OperationDepsNode *add_operation(DepsEvalOperationCb op, OperationDepsNode *add_operation(const DepsEvalOperationCb& op,
eDepsOperation_Code opcode, eDepsOperation_Code opcode,
const char *name, const char *name,
int name_tag); int name_tag);