diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 14:37:51 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 14:37:51 +0300 |
| commit | c6ca842e234024b0276e5b294455ed2dbbe998e0 (patch) | |
| tree | e1c3fb393507c0fe4092e3e133f3ddaec239463e /source/blender/editors/uvedit | |
| parent | d8f1b18d9b7494070715dd7a74e0c7753a43a3aa (diff) | |
Fix T61937: image sequences not updating in workbench display mode.
Need to pass the image user along to get the frame number.
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 5d73f0c8b04..f771feeff2c 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -159,7 +159,17 @@ bool ED_object_get_active_image( if (node && is_image_texture_node(node)) { if (r_ima) *r_ima = (Image *)node->id; - if (r_iuser) *r_iuser = NULL; + if (r_iuser) { + if (node->type == SH_NODE_TEX_IMAGE) { + *r_iuser = &((NodeTexImage *)node->storage)->iuser; + } + else if (node->type == SH_NODE_TEX_ENVIRONMENT) { + *r_iuser = &((NodeTexEnvironment *)node->storage)->iuser; + } + else { + *r_iuser = NULL; + } + } if (r_node) *r_node = node; if (r_ntree) *r_ntree = ntree; return true; |