Help compilers optimize Object::cast_to()

godotengine · Mar 6, 2024 · fdc47ad · fdc47ad
1 parent 72a3172
commit fdc47ad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/object/object.h b/core/object/object.h
@@ -798,12 +798,12 @@ class Object {
 
 	template <class T>
 	static T *cast_to(Object *p_object) {
-		return dynamic_cast<T *>(p_object);
+		return p_object ? dynamic_cast<T *>(p_object) : nullptr;
 	}
 
 	template <class T>
 	static const T *cast_to(const Object *p_object) {
-		return dynamic_cast<const T *>(p_object);
+		return p_object ? dynamic_cast<const T *>(p_object) : nullptr;
 	}
 
 	enum {