diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-04-28 18:18:01 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-04-28 18:18:01 +0300 |
| commit | 7bc4a436a0811dd8822c5c77f28aac81e64277b8 (patch) | |
| tree | 0db8d8009085832cd0d7c2448a38570e18ecf9ff /source/blender/editors/space_image | |
| parent | a72eed7dd5dec92e8d507a897f3f090fba66ef81 (diff) | |
| parent | 475bd6b829c38966b0fd4fdaff2eb61cc71c46c4 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 3658ebae3a2..fcd6baa9582 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -656,8 +656,8 @@ static void uiblock_layer_pass_buttons( /* pass */ rpass = (rl ? BLI_findlink(&rl->passes, iuser->pass) : NULL); - if (rpass && RE_passes_have_name(rl)) { - display_name = rpass->name; + if (RE_passes_have_name(rl)) { + display_name = rpass ? rpass->name : ""; rnd_pt = ui_imageuser_data_copy(&rnd_pt_local); but = uiDefMenuBut(block, ui_imageuser_pass_menu, |