diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-19 04:41:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-19 04:41:11 +0400 |
commit | b7cd9ec3ada529bf1d57cf08cc96851ceb67a47d (patch) | |
tree | 4ec25ec70b30c3e4a18b384e1938e3aec957d264 /extern | |
parent | 6cee7bb2b77bc7b577a3067c30dc56e22b4752ce (diff) | |
parent | eb1fccd8a54c33a057fa3692eb3dfa1012f4fdfc (diff) |
Merged changes in the trunk up to revision 52340.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'extern')
-rw-r--r-- | extern/xdnd/xdnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/xdnd/xdnd.c b/extern/xdnd/xdnd.c index 9bdee89c1ce..50d1fec4969 100644 --- a/extern/xdnd/xdnd.c +++ b/extern/xdnd/xdnd.c @@ -347,7 +347,7 @@ void xdnd_set_dnd_aware (DndClass * dnd, Window window, Atom * typelist) &nchildren_return); if (children_return) XFree (children_return); - if (r) + if (r && parent != root_return) xdnd_set_dnd_aware (dnd, parent, typelist); } |