diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
| commit | 121ff4223dbd5c42ecc4919d09ce464d01faf4e7 (patch) | |
| tree | 5102e8d4f18a142aaff07fc355d0fd0208ccf651 /source/blender/editors/space_buttons | |
| parent | a96c3ce9e0a61bc29fef8212a742658795aabbed (diff) | |
| parent | 77c51607914b7fe4744437f6d47fedab628b444d (diff) | |
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index dd9f3c57896..4446a2e848a 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -117,10 +117,10 @@ static void buttons_texture_users_find_nodetree(ListBase *users, ID *id, for(node=ntree->nodes.first; node; node=node->next) { if(node->typeinfo->nclass == NODE_CLASS_TEXTURE) { PointerRNA ptr; - PropertyRNA *prop; + /* PropertyRNA *prop; */ /* UNUSED */ RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr); - prop = RNA_struct_find_property(&ptr, "texture"); + /* prop = RNA_struct_find_property(&ptr, "texture"); */ /* UNUSED */ buttons_texture_user_node_add(users, id, ntree, node, category, RNA_struct_ui_icon(ptr.type), node->name); |