diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:46:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:49:06 +0300 |
| commit | a760e73dcf6f0a0da901359d1456ad5ca180ebeb (patch) | |
| tree | 9e0be802377a153e8d6fc37b2eec163be6ff5d12 /source/blender/editors/space_node/drawnode.c | |
| parent | a687d98e67823932f95bc3c1b1452109282a3e41 (diff) | |
| parent | 6429e6c91ef4422083ed56b068dea636a322fe12 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index b5d47809606..10ec293082f 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -2986,7 +2986,7 @@ void ED_node_init_butfuncs(void) NodeSocketTypeUndefined.interface_draw_color = node_socket_undefined_interface_draw_color; /* node type ui functions */ - NODE_TYPES_BEGIN(ntype) + NODE_TYPES_BEGIN(ntype) { /* default ui functions */ ntype->draw_nodetype = node_draw_default; ntype->draw_nodetype_prepare = node_update_default; @@ -3004,7 +3004,7 @@ void ED_node_init_butfuncs(void) /* define update callbacks for socket properties */ node_template_properties_update(ntype); - NODE_TYPES_END + } NODE_TYPES_END; /* tree type icons */ ntreeType_Composite->ui_icon = ICON_NODE_COMPOSITING; |