mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
patch suggested by Clemens Pecinovsky
This commit is contained in:
parent
b35568a0b5
commit
61c935f04d
@ -279,8 +279,8 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
|
||||
if (!remove.empty()) {
|
||||
Regions only_a, only_b, both;
|
||||
intersect_regions(only_a, only_b, both,
|
||||
_current_regions, remove);
|
||||
_current_regions.swap(only_a);
|
||||
_regions, remove);
|
||||
_regions.swap(only_a);
|
||||
|
||||
if (has_region_in(both, _preferred_region)) {
|
||||
if (_preferred_region != (MouseWatcherRegion *)NULL) {
|
||||
@ -297,8 +297,8 @@ replace_group(MouseWatcherGroup *old_group, MouseWatcherGroup *new_group) {
|
||||
if (!add.empty()) {
|
||||
Regions new_list;
|
||||
intersect_regions(new_list, new_list, new_list,
|
||||
_current_regions, add);
|
||||
_current_regions.swap(new_list);
|
||||
_regions, add);
|
||||
_regions.swap(new_list);
|
||||
}
|
||||
|
||||
// Add the new group, if it's not already there.
|
||||
|
Loading…
x
Reference in New Issue
Block a user