diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
| commit | e52beb373323122f6d706e887a8ee3e2c58beb2e (patch) | |
| tree | 0e409009d8aa4df733fe50dee504ae361040a171 /source/blender/compositor | |
| parent | c713e9c4724f2f75e28eb421021ed0428e919aab (diff) | |
| parent | ab695c32974fde8720c04dff47d240b7fa0f8151 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ImageNode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 81891d853d2..1399749fc8d 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -105,7 +105,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo } /* returns the image view to use for the current active view */ - if (BLI_listbase_count_ex(&image->rr->views, 2) > 1) { + if (BLI_listbase_count_at_most(&image->rr->views, 2) > 1) { const int view_image = imageuser->view; const bool is_allview = (view_image == 0); /* if view selected == All (0) */ |