[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57931] trunk/blender/source/blender/ makesrna/intern: Fix #35944: adding keyframes or drivers on image sequences offset did not work

[Brecht Van Lommel]

Revision: 57931
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57931
Author:   blendix
Date:     2013-07-02 15:56:32 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Fix #35944: adding keyframes or drivers on image sequences offset did not work
for cycles image texture node.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_image.c
    trunk/blender/source/blender/makesrna/intern/rna_internal.h
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image.c	2013-07-02 13:18:56 UTC (rev 57930)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c	2013-07-02 15:56:32 UTC (rev 57931)
@@ -158,8 +158,12 @@
 		/* ImageUser *iuser = ptr->data; */
 		
 		switch (GS(((ID *)ptr->id.data)->name)) {
-			case ID_TE:
+			case ID_TE: {
 				return BLI_strdup("image_user");
+			}
+			case ID_NT: {
+				return rna_Node_ImageUser_path(ptr);
+			}
 		}
 	}
 	

Modified: trunk/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_internal.h	2013-07-02 13:18:56 UTC (rev 57930)
+++ trunk/blender/source/blender/makesrna/intern/rna_internal.h	2013-07-02 15:56:32 UTC (rev 57931)
@@ -246,6 +246,7 @@
 int rna_Action_actedit_assign_poll(struct PointerRNA *ptr, struct PointerRNA value);
 
 char *rna_TextureSlot_path(struct PointerRNA *ptr);
+char *rna_Node_ImageUser_path(struct PointerRNA *ptr);
 
 /* API functions */
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-07-02 13:18:56 UTC (rev 57930)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-07-02 15:56:32 UTC (rev 57931)
@@ -1126,6 +1126,33 @@
 	return BLI_sprintfN("nodes[\"%s\"]", name_esc);
 }
 
+char *rna_Node_ImageUser_path(PointerRNA *ptr)
+{
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node;
+	char name_esc[sizeof(node->name) * 2];
+
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == SH_NODE_TEX_ENVIRONMENT) {
+			NodeTexEnvironment *data = node->storage;
+			if (&data->iuser != ptr->data)
+				continue;
+		}
+		else if (node->type == SH_NODE_TEX_IMAGE) {
+			NodeTexImage *data = node->storage;
+			if (&data->iuser != ptr->data)
+				continue;
+		}
+		else
+			continue;
+
+		BLI_strescape(name_esc, node->name, sizeof(name_esc));
+		return BLI_sprintfN("nodes[\"%s\"].image_user", name_esc);
+	}
+
+	return NULL;
+}
+
 static int rna_Node_poll(bNodeType *ntype, bNodeTree *ntree)
 {
 	extern FunctionRNA rna_Node_poll_func;