summaryrefslogtreecommitdiffstats
path: root/scene/3d
diff options
context:
space:
mode:
authorqarmin <mikrutrafal54@gmail.com>2019-07-07 23:08:51 +0200
committerqarmin <mikrutrafal54@gmail.com>2019-07-07 23:08:51 +0200
commit9a77d748c0d4e1c3dceb40216b9a345073032361 (patch)
tree3fef755e93df1df19207982deca39610d92c950f /scene/3d
parentd897131ac555de84afe9ca6845abf87c26957895 (diff)
downloadredot-engine-9a77d748c0d4e1c3dceb40216b9a345073032361.tar.gz
Fixes minor issues found by static analyzer
Diffstat (limited to 'scene/3d')
-rw-r--r--scene/3d/baked_lightmap.h2
-rw-r--r--scene/3d/particles.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/baked_lightmap.h b/scene/3d/baked_lightmap.h
index fac4ad3908..3a9f4cf01d 100644
--- a/scene/3d/baked_lightmap.h
+++ b/scene/3d/baked_lightmap.h
@@ -179,7 +179,7 @@ public:
void set_extents(const Vector3 &p_extents);
Vector3 get_extents() const;
- void set_bake_default_texels_per_unit(const float &p_extents);
+ void set_bake_default_texels_per_unit(const float &p_bake_texels_per_unit);
float get_bake_default_texels_per_unit() const;
void set_propagation(float p_propagation);
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp
index 00a168fc39..a6ccdb5791 100644
--- a/scene/3d/particles.cpp
+++ b/scene/3d/particles.cpp
@@ -257,7 +257,7 @@ String Particles::get_configuration_warning() const {
SpatialMaterial *spat = Object::cast_to<SpatialMaterial>(draw_passes[i]->surface_get_material(j).ptr());
anim_material_found = anim_material_found || (spat && spat->get_billboard_mode() == SpatialMaterial::BILLBOARD_PARTICLES);
}
- if (meshes_found && anim_material_found) break;
+ if (anim_material_found) break;
}
}