Browse Source

Merge pull request #30031 from qarmin/prevent_setting_bad_index_enums

Set to enum variables, only correct values
Rémi Verschelde 6 years ago
parent
commit
908a50739a
2 changed files with 2 additions and 0 deletions
  1. 1 0
      scene/3d/sprite_3d.cpp
  2. 1 0
      scene/resources/texture.cpp

+ 1 - 0
scene/3d/sprite_3d.cpp

@@ -163,6 +163,7 @@ float SpriteBase3D::get_opacity() const {
 
 void SpriteBase3D::set_axis(Vector3::Axis p_axis) {
 
+	ERR_FAIL_INDEX(p_axis, 3);
 	axis = p_axis;
 	_queue_update();
 }

+ 1 - 0
scene/resources/texture.cpp

@@ -1502,6 +1502,7 @@ void CubeMap::set_side(Side p_side, const Ref<Image> &p_image) {
 
 Ref<Image> CubeMap::get_side(Side p_side) const {
 
+	ERR_FAIL_INDEX_V(p_side, 6, Ref<Image>());
 	if (!valid[p_side])
 		return Ref<Image>();
 	return VS::get_singleton()->texture_get_data(cubemap, VS::CubeMapSide(p_side));