From 2bda71c8fbb33c048d082c493500f425f469fed9 Mon Sep 17 00:00:00 2001 From: Selmar Kok Date: Fri, 5 Oct 2018 14:36:05 +0200 Subject: [PATCH] - always check Parameter::number_value to catch user errors, e.g. setting number_value without setting has_number_value, which will cause it to serialize as a bool but read back in as a float anyway --- tiny_gltf.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index b0f3912..e56b02d 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -1245,9 +1245,8 @@ bool Parameter::operator==(const Parameter &other) const { this->has_number_value != other.has_number_value) return false; - if (this->has_number_value) - if (!TINYGLTF_DOUBLE_EQUAL(this->number_value, other.number_value)) - return false; + if (!TINYGLTF_DOUBLE_EQUAL(this->number_value, other.number_value)) + return false; if (this->json_double_value.size() != other.json_double_value.size()) return false;