TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

patch suggested by Clemens Pecinovsky

Browse Source
This commit is contained in:
David Rose 2008-05-08 16:41:08 +00:00
parent b35568a0b5
commit 61c935f04d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/tform/mouseWatcher.cxx
View File

@ -279,8 +279,8 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
if (!remove.empty()) { if (!remove.empty()) {
Regions only_a, only_b, both; Regions only_a, only_b, both;
intersect_regions(only_a, only_b, both, intersect_regions(only_a, only_b, both,
_current_regions, remove); _regions, remove);
_current_regions.swap(only_a); _regions.swap(only_a);
if (has_region_in(both, _preferred_region)) { if (has_region_in(both, _preferred_region)) {
if (_preferred_region != (MouseWatcherRegion *)NULL) { if (_preferred_region != (MouseWatcherRegion *)NULL) {
@ -297,8 +297,8 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
if (!add.empty()) { if (!add.empty()) {
Regions new_list; Regions new_list;
intersect_regions(new_list, new_list, new_list, intersect_regions(new_list, new_list, new_list,
_current_regions, add); _regions, add);
_current_regions.swap(new_list); _regions.swap(new_list);
} }
// Add the new group, if it's not already there. // Add the new group, if it's not already there.