bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Once a linked image was selected, from a texture there was no way to switch to a local image because the dropdown was blocked with a linked library error message.

Browse Source 
Remove linked library checking from this image selector, this isn't quite correct since the texture could be linked too, however there is no access to the texture data (or other users) when this button is drawn.
This commit is contained in:
Campbell Barton 2009-02-11 08:16:42 +00:00
parent 227c84f64e
commit fec8107281
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/src/buttons_shading.c
View File

@ -1126,9 +1126,10 @@ void uiblock_image_panel(uiBlock *block, Image **ima_pp, ImageUser *iuser,
IMAnames_to_pupstring(&strp, NULL, NULL, &(G.main->image), NULL, &iuser->menunr);
uiBlockBeginAlign(block);
uiClearButLock(); /* no way to check if the image user is libdata or not, so assume its not, otherwise we cant select linked images - ANNOYING */
but= uiDefButS(block, MENU, imagechanged, strp, 10,155,23,20, &iuser->menunr, 0, 0, 0, 0, "Selects an existing Image or Movie");
uiButSetFunc(but, image_browse_cb, ima_pp, iuser);
uiSetButLock(ima && (ima->id.lib!=NULL), ERROR_LIBDATA_MESSAGE);
MEM_freeN(strp);
/* name + options, or only load */