4 files changed, 3 insertions, 34 deletions
diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index c1bdd6a6bc..8b958814db 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -402,6 +402,7 @@ Array Array::recursive_duplicate(bool p_deep, int recursion_count) const {
 
 Array Array::slice(int p_begin, int p_end, int p_step, bool p_deep) const {
 	Array result;
+	result._p->typed = _p->typed;
 
 	ERR_FAIL_COND_V_MSG(p_step == 0, result, "Slice step cannot be zero.");
 
@@ -433,6 +434,7 @@ Array Array::slice(int p_begin, int p_end, int p_step, bool p_deep) const {
 Array Array::filter(const Callable &p_callable) const {
 	Array new_arr;
 	new_arr.resize(size());
+	new_arr._p->typed = _p->typed;
 	int accepted_count = 0;
 
 	const Variant *argptrs[1];
diff --git a/core/variant/variant_destruct.cpp b/core/variant/variant_destruct.cpp
index ab8303f3ae..5117c33e2b 100644
--- a/core/variant/variant_destruct.cpp
+++ b/core/variant/variant_destruct.cpp
@@ -41,13 +41,8 @@ static void add_destructor() {
 
 void Variant::_register_variant_destructors() {
 	add_destructor<VariantDestruct<String>>();
-	add_destructor<VariantDestruct<Transform2D>>();
-	add_destructor<VariantDestruct<::AABB>>();
-	add_destructor<VariantDestruct<Basis>>();
-	add_destructor<VariantDestruct<Transform3D>>();
 	add_destructor<VariantDestruct<StringName>>();
 	add_destructor<VariantDestruct<NodePath>>();
-	add_destructor<VariantDestruct<::RID>>();
 	add_destructor<VariantDestruct<Callable>>();
 	add_destructor<VariantDestruct<Signal>>();
 	add_destructor<VariantDestruct<Dictionary>>();
diff --git a/core/variant/variant_destruct.h b/core/variant/variant_destruct.h
index 5e3478635d..2730110c0f 100644
--- a/core/variant/variant_destruct.h
+++ b/core/variant/variant_destruct.h
@@ -50,13 +50,8 @@ struct VariantDestruct {};
 	}
 
 MAKE_PTRDESTRUCT(String);
-MAKE_PTRDESTRUCT(Transform2D);
-MAKE_PTRDESTRUCT(AABB);
-MAKE_PTRDESTRUCT(Basis);
-MAKE_PTRDESTRUCT(Transform3D);
 MAKE_PTRDESTRUCT(StringName);
 MAKE_PTRDESTRUCT(NodePath);
-MAKE_PTRDESTRUCT(RID);
 MAKE_PTRDESTRUCT(Callable);
 MAKE_PTRDESTRUCT(Signal);
 MAKE_PTRDESTRUCT(Dictionary);
diff --git a/core/variant/variant_internal.h b/core/variant/variant_internal.h
index 874a183d29..7ae2368fe4 100644
--- a/core/variant/variant_internal.h
+++ b/core/variant/variant_internal.h
@@ -1047,7 +1047,7 @@ struct VariantInternalAccessor<PackedColorArray> {
 template <>
 struct VariantInternalAccessor<Object *> {
 	static _FORCE_INLINE_ Object *get(const Variant *v) { return const_cast<Object *>(*VariantInternal::get_object(v)); }
-	static _FORCE_INLINE_ void set(Variant *v, const Object *p_value) { *VariantInternal::get_object(v) = const_cast<Object *>(p_value); }
+	static _FORCE_INLINE_ void set(Variant *v, const Object *p_value) { VariantInternal::object_assign(v, p_value); }
 };
 
 template <>
@@ -1532,27 +1532,4 @@ struct VariantTypeConstructor {
 	}
 };
 
-template <>
-struct VariantTypeConstructor<Object *> {
-	_FORCE_INLINE_ static void variant_from_type(void *p_variant, void *p_value) {
-		Variant *variant = reinterpret_cast<Variant *>(p_variant);
-		VariantInitializer<Object *>::init(variant);
-		Object *object = *(reinterpret_cast<Object **>(p_value));
-		if (object) {
-			if (object->is_ref_counted()) {
-				if (!VariantInternal::initialize_ref(object)) {
-					return;
-				}
-			}
-			VariantInternalAccessor<Object *>::set(variant, object);
-			VariantInternalAccessor<ObjectID>::set(variant, object->get_instance_id());
-		}
-	}
-
-	_FORCE_INLINE_ static void type_from_variant(void *p_value, void *p_variant) {
-		Object **value = reinterpret_cast<Object **>(p_value);
-		*value = VariantInternalAccessor<Object *>::get(reinterpret_cast<Variant *>(p_variant));
-	}
-};
-
 #endif // VARIANT_INTERNAL_H