griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T76179: Unable to select render passes when a render has fewer

Browse Source 
passes than one in another slot

If a particular pass is not available in a slot we are switching to,
still show the menu, but with a blank name for the currently selected
item so that the user can change it to a valid value.

thx @brecht for providing the standard way Blender deals with these
kinds of situations.

Maniphest Tasks: T76179

Differential Revision: https://developer.blender.org/D7552
This commit is contained in:
Philipp Oeser
2020-04-28 12:59:23 +02:00
parent 37e08e526c
commit 475bd6b829
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_image/image_buttons.c
View File

@@ -656,8 +656,8 @@ static void uiblock_layer_pass_buttons(
/* pass */ /* pass */
rpass = (rl ? BLI_findlink(&rl->passes, iuser->pass) : NULL); rpass = (rl ? BLI_findlink(&rl->passes, iuser->pass) : NULL);
if (rpass && RE_passes_have_name(rl)) { if (RE_passes_have_name(rl)) {
display_name = rpass->name; display_name = rpass ? rpass->name : "";
rnd_pt = ui_imageuser_data_copy(&rnd_pt_local); rnd_pt = ui_imageuser_data_copy(&rnd_pt_local);
but = uiDefMenuBut(block, but = uiDefMenuBut(block,
ui_imageuser_pass_menu, ui_imageuser_pass_menu,