diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-01 02:09:43 +0400 |
| commit | 4c36a26af5d1093badc88401bfebf8454fdf0f34 (patch) | |
| tree | 2e82fc5ff893651982d20ffdd15d4c69bfcbe7b8 /source/blender/editors/space_node/node_buttons.c | |
| parent | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (diff) | |
| parent | 8f949dd58decac45fd49f9a93152f2cddc98d901 (diff) | |
Merged changes in the trunk up to revision 45308.
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/editors/space_node/node_buttons.c')
| -rw-r--r-- | source/blender/editors/space_node/node_buttons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 19eebe4d320..dac185bf46e 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -98,7 +98,7 @@ static void active_node_panel(const bContext *C, Panel *pa) PointerRNA ptr; /* verify pointers, and create RNA pointer for the node */ - if ELEM(NULL, ntree, node) + if (ELEM(NULL, ntree, node)) return; //if (node->id) /* for group nodes */ // RNA_pointer_create(node->id, &RNA_Node, node, &ptr); |