From c6ca842e234024b0276e5b294455ed2dbbe998e0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 14 Mar 2019 12:37:51 +0100 Subject: Fix T61937: image sequences not updating in workbench display mode. Need to pass the image user along to get the frame number. --- source/blender/editors/uvedit/uvedit_ops.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/uvedit') 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; -- cgit v1.2.3