Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
62142c54
Commit
62142c54
authored
Jun 13, 2020
by
Marcel Admiraal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure pair callback data is set to null when it's null.
parent
84abf5a9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
broad_phase_2d_hash_grid.cpp
servers/physics_2d/broad_phase_2d_hash_grid.cpp
+1
-4
No files found.
servers/physics_2d/broad_phase_2d_hash_grid.cpp
View file @
62142c54
...
...
@@ -75,10 +75,7 @@ void BroadPhase2DHashGrid::_check_motion(Element *p_elem) {
if
(
pairing
!=
E
->
get
()
->
colliding
)
{
if
(
pairing
)
{
if
(
pair_callback
)
{
void
*
ud
=
pair_callback
(
p_elem
->
owner
,
p_elem
->
subindex
,
E
->
key
()
->
owner
,
E
->
key
()
->
subindex
,
pair_userdata
);
if
(
ud
)
{
E
->
get
()
->
ud
=
ud
;
}
E
->
get
()
->
ud
=
pair_callback
(
p_elem
->
owner
,
p_elem
->
subindex
,
E
->
key
()
->
owner
,
E
->
key
()
->
subindex
,
pair_userdata
);
}
}
else
{
if
(
unpair_callback
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment