Merge pull request #242 from zeux/sampler-invalid-gltf

jkuhlmann · Jan 11, 2024 · 3531d8c · 3531d8c
2 parents 8731d31 + 5566653
commit 3531d8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cgltf.h b/cgltf.h
@@ -1738,7 +1738,7 @@ cgltf_result cgltf_validate(cgltf_data* data)
 
 			cgltf_size values = channel->sampler->interpolation == cgltf_interpolation_type_cubic_spline ? 3 : 1;
 
-			CGLTF_ASSERT_IF(channel->sampler->input->count * components * values != channel->sampler->output->count, cgltf_result_data_too_short);
+			CGLTF_ASSERT_IF(channel->sampler->input->count * components * values != channel->sampler->output->count, cgltf_result_invalid_gltf);
 		}
 	}
 

diff --git a/test/test_all.py b/test/test_all.py
@@ -52,7 +52,7 @@ def collect_files(path, type, name):
         f = open(".git/info/sparse-checkout", "w+")
         f.write("2.0/*\n")
         f.close()
-        os.system("git pull --depth=1 origin master")
+        os.system("git pull --depth=1 origin main")
         os.chdir("..")
     collect_files("glTF-Sample-Models/2.0/", ".glb", "cgltf_test")
     collect_files("glTF-Sample-Models/2.0/", ".gltf", "cgltf_test")
-Original file line number
+Diff line change
@@ Expand Up / @@ -1738,7 +1738,7 @@ cgltf_result cgltf_validate(cgltf_data* data) @@
     			cgltf_size values = channel->sampler->interpolation == cgltf_interpolation_type_cubic_spline ? 3 : 1;
-    			CGLTF_ASSERT_IF(channel->sampler->input->count * components * values != channel->sampler->output->count, cgltf_result_data_too_short);
+    			CGLTF_ASSERT_IF(channel->sampler->input->count * components * values != channel->sampler->output->count, cgltf_result_invalid_gltf);
     		}
     	}
@@ Expand Down @@