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/include | |
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/include')
-rw-r--r-- | source/blender/editors/include/ED_node.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h index 6828cedbd80..f959b7f53ba 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node.h @@ -86,7 +86,7 @@ float ED_node_grid_size(void); /* node_relationships.c */ void ED_node_link_intersect_test(struct ScrArea *sa, int test); -void ED_node_link_insert(struct ScrArea *sa); +void ED_node_link_insert(struct Main *bmain, struct ScrArea *sa); /* node_edit.c */ void ED_node_set_tree_type(struct SpaceNode *snode, struct bNodeTreeType *typeinfo); |