Merge pull request #34259 from timothyqiu/validate-texture-32982

Fixes crash after set_piece_texture with invalid texture
2019-12-11 08:41:29 +01:00
parent ea865d0e7e 5586103a94
commit 30cf60bb89
1 changed files with 1 additions and 0 deletions
@@ -1333,6 +1333,7 @@ void LargeTexture::set_piece_offset(int p_idx, const Point2 &p_offset) {
 void LargeTexture::set_piece_texture(int p_idx, const Ref<Texture> &p_texture) {

 	ERR_FAIL_COND(p_texture == this);
+	ERR_FAIL_COND(p_texture.is_null());
 	ERR_FAIL_INDEX(p_idx, pieces.size());
 	pieces.write[p_idx].texture = p_texture;
 };