diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-09 16:18:21 +0300 |
| commit | 70f8eaf1b769c402ec61d86f25237d6b64186861 (patch) | |
| tree | 035d1da0dc7ca1ff1cfefad013181dc0ce3084ed /source/blender/editors/space_node/node_intern.h | |
| parent | 2ca8230f67db3d6c4693d0a2e0997dfd5de43091 (diff) | |
| parent | 638de722775fc43c3543a30aaa888372fe93fe98 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/space_node/node_intern.h')
| -rw-r--r-- | source/blender/editors/space_node/node_intern.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 4440b2c6ecd..2cc37a4e0fe 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -41,6 +41,7 @@ struct ARegion; struct ARegionType; struct View2D; struct bContext; +struct Main; struct wmWindow; struct bNode; struct bNodeSocket; @@ -157,7 +158,7 @@ void NODE_OT_group_edit(struct wmOperatorType *ot); /* node_relationships.c */ -bool node_connected_to_output(struct bNodeTree *ntree, struct bNode *node); +bool node_connected_to_output(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node); void NODE_OT_link(struct wmOperatorType *ot); void NODE_OT_link_make(struct wmOperatorType *ot); |