diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-12 11:39:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 11:39:47 +0200 |
| commit | 2b50dc5d4f0b9d0c6fd5463b5d89d17578b388ab (patch) | |
| tree | c3bd911221cb9e3850f28bf5e5c605fcbad1089e /servers/physics/broad_phase_basic.cpp | |
| parent | d455b13fcf7ff7ce5d62c08d97e035cf27805be5 (diff) | |
| parent | 67a706fc1b9721f3f06eef8be7312f175e2041ce (diff) | |
| download | redot-engine-2b50dc5d4f0b9d0c6fd5463b5d89d17578b388ab.tar.gz | |
Merge pull request #11057 from hpvb/fix-various-warnings
Fix various assorted warnings
Diffstat (limited to 'servers/physics/broad_phase_basic.cpp')
| -rw-r--r-- | servers/physics/broad_phase_basic.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp index 959718a252..c6565ac2e9 100644 --- a/servers/physics/broad_phase_basic.cpp +++ b/servers/physics/broad_phase_basic.cpp @@ -30,9 +30,10 @@ #include "broad_phase_basic.h" #include "list.h" #include "print_string.h" + BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subindex) { - ERR_FAIL_COND_V(p_object == NULL, NULL); + ERR_FAIL_COND_V(p_object == NULL, 0); current++; |