[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28159] branches/render25/source/blender/ editors/space_node/drawnode.c: Geometry node uv/ color layer now has search list/autocomplete.

[Brecht Van Lommel]

Revision: 28159
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28159
Author:   blendix
Date:     2010-04-13 11:23:19 +0200 (Tue, 13 Apr 2010)

Log Message:
-----------
Geometry node uv/color layer now has search list/autocomplete.

Modified Paths:
--------------
    branches/render25/source/blender/editors/space_node/drawnode.c

Modified: branches/render25/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/render25/source/blender/editors/space_node/drawnode.c	2010-04-13 08:30:53 UTC (rev 28158)
+++ branches/render25/source/blender/editors/space_node/drawnode.c	2010-04-13 09:23:19 UTC (rev 28159)
@@ -349,11 +349,21 @@
 
 static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
+	PointerRNA obptr= CTX_data_pointer_get(C, "active_object");
 	uiLayout *col;
-	
+
 	col= uiLayoutColumn(layout, 0);
-	uiItemR(col, ptr, "uv_layer", 0, "UV", 0);
-	uiItemR(col, ptr, "color_layer", 0, "VCol", 0);
+
+	if(obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
+		PointerRNA dataptr= RNA_pointer_get(&obptr, "data");
+
+		uiItemPointerR(col, ptr, "uv_layer", &dataptr, "uv_textures", "", 0);
+		uiItemPointerR(col, ptr, "color_layer", &dataptr, "vertex_colors", "", 0);
+	}
+	else {
+		uiItemR(col, ptr, "uv_layer", 0, "UV", 0);
+		uiItemR(col, ptr, "color_layer", 0, "VCol", 0);
+	}
 }
 
 static void node_shader_buts_dynamic(uiLayout *layout, bContext *C, PointerRNA *ptr)