diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-12 11:57:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 11:57:49 +0200 |
| commit | cf941fdc357791a93bd9ab9eaf16898e0c218ff3 (patch) | |
| tree | 546d046bffd826359c85240ae4562ef5df734e86 /scene/3d/collision_shape.cpp | |
| parent | 84ccda4e1d6f9a63b689167887f7d329cdc5dffa (diff) | |
| parent | 8230bf0a2f39f0849b670d26067207c45edcca1a (diff) | |
Merge pull request #11026 from hpvb/fix-assign-in-if
Remove assignment and declarations in if statements
Diffstat (limited to 'scene/3d/collision_shape.cpp')
| -rw-r--r-- | scene/3d/collision_shape.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index 5f1151f8e9..f49d89122d 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -50,7 +50,8 @@ void CollisionShape::make_convex_from_brothers() { for (int i = 0; i < p->get_child_count(); i++) { Node *n = p->get_child(i); - if (MeshInstance *mi = Object::cast_to<MeshInstance>(n)) { + MeshInstance *mi = Object::cast_to<MeshInstance>(n); + if (mi) { Ref<Mesh> m = mi->get_mesh(); if (m.is_valid()) { |