diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-16 23:06:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-16 23:06:38 +0400 |
| commit | 9d05ccf9e84510ca7e3fe140f6e20991a931b8ce (patch) | |
| tree | f8f7241b779c9049d853a5e824db2dd150228ebe /source/blender/editors/space_buttons | |
| parent | 707fcc42a390e91aedd858588c30d04fea43f0e6 (diff) | |
| parent | 1af839081b7adcc3ceb13e5e7cc579b309e90915 (diff) | |
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 9de804d275f..4c028612320 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -805,7 +805,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r if(ma) { bNode *node= give_current_material_texture_node(ma); - CTX_data_pointer_set(result, &ma->id, &RNA_Node, node); + CTX_data_pointer_set(result, &ma->nodetree->id, &RNA_Node, node); } } |