diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-02-11 11:16:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-02-11 11:16:42 +0300 |
| commit | fec8107281dcf4fc751805efd0521bf248e6ef03 (patch) | |
| tree | 8910ffb0c9a53778ede27d51072d76e4cddf3bd5 | |
| parent | 227c84f64ecbdb82fe5a73a71d542efa0076a69f (diff) | |
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.
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.
| -rw-r--r-- | source/blender/src/buttons_shading.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 4ca1c13ddb2..98b78d54fff 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -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 */ |