Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #53889 from Klowner/surfacetool-generate-lod-assert-crash

Add check to SurfaceTool.generate_lod(); ensure target index count >=…
Rémi Verschelde 3 years ago
parent
468b987aa3 5d96124af6
commit
b6ee9ed8c5
1 changed files with 2 additions and 0 deletions
Unified View Show Diff Stats
  1. 2 0
      scene/resources/surface_tool.cpp

+ 2 - 0
scene/resources/surface_tool.cpp
View File 

@@ -1174,9 +1174,11 @@ Vector<int> SurfaceTool::generate_lod(float p_threshold, int p_target_index_coun
 
 	Vector<int> lod;
 
 	Vector<int> lod;
 
 
 
 	ERR_FAIL_COND_V(simplify_func == nullptr, lod);
 
 	ERR_FAIL_COND_V(simplify_func == nullptr, lod);
 
+	ERR_FAIL_COND_V(p_target_index_count < 0, lod);
 
 	ERR_FAIL_COND_V(vertex_array.size() == 0, lod);
 
 	ERR_FAIL_COND_V(vertex_array.size() == 0, lod);
 
 	ERR_FAIL_COND_V(index_array.size() == 0, lod);
 
 	ERR_FAIL_COND_V(index_array.size() == 0, lod);
 
 	ERR_FAIL_COND_V(index_array.size() % 3 != 0, lod);
 
 	ERR_FAIL_COND_V(index_array.size() % 3 != 0, lod);
 
+	ERR_FAIL_COND_V(index_array.size() < (unsigned int)p_target_index_count, lod);
 
 
 
 	lod.resize(index_array.size());
 
 	lod.resize(index_array.size());
 
 	LocalVector<float> vertices; //uses floats
 
 	LocalVector<float> vertices; //uses floats