Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c12
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;