diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-05-23 00:28:41 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-05-23 00:28:41 +0300 |
| commit | 25f5d2b4d7e83f52807be13d255cfde2ea51d8ee (patch) | |
| tree | 553c9239046f62cc91b8ad7f8731c484647ebaab /source/blender/editors | |
| parent | e529882be0752cdfd4fcf2f6b6bc06bcb44947af (diff) | |
Fix (unreported) broken RNA Image pack handling since multiview merge.
Was breaking loading of embedded FBX images (among other things, most likely).
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index d08a8bacd29..648c93ff20c 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -864,14 +864,15 @@ static void node_shader_buts_tex_environment_ex(uiLayout *layout, bContext *C, P if (!(ELEM(ima->source, IMA_SRC_GENERATED, IMA_SRC_VIEWER))) { uiLayout *row = uiLayoutRow(layout, true); + const bool is_packed = BKE_image_has_packedfile(ima); - if (ima->packedfile) + if (is_packed) uiItemO(row, "", ICON_PACKAGE, "image.unpack"); else uiItemO(row, "", ICON_UGLYPACKAGE, "image.pack"); row = uiLayoutRow(row, true); - uiLayoutSetEnabled(row, ima->packedfile == NULL); + uiLayoutSetEnabled(row, !is_packed); uiItemR(row, &imaptr, "filepath", 0, "", ICON_NONE); uiItemO(row, "", ICON_FILE_REFRESH, "image.reload"); } |