diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-15 18:32:45 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-15 18:32:45 +0300 |
| commit | adf1b932f0092d3a814bcd7aa6827c53e3b520f7 (patch) | |
| tree | c13b9678a076f91a3fdcd55659d9e3c1dc29c1a3 /source/blender/editors/space_node | |
| parent | e1c1b546b5817ff8d8711edc41c12a5d10dd094c (diff) | |
| parent | ce0d3112e40fe54bd56926b758cda4e502fb782a (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/animation/anim_draw.c
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 5b0024f81a1..d27ddc99851 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -125,7 +125,7 @@ void ED_node_tag_update_id(ID *id) return; /* TODO(sergey): With the new dependency graph it - * should be just enough to ony tag ntree itself, + * should be just enough to only tag ntree itself, * all the users of this tree will have update * flushed from the tree, */ |