New particle system, mostly working, some small features missing.

2 files changed, 1 insertions, 24 deletions

diff --git a/core/math/transform.h b/core/math/transform.h
index e307aba129..64b4b23aa0 100644
--- a/core/math/transform.h
+++ b/core/math/transform.h
@@ -229,27 +229,4 @@ _FORCE_INLINE_ Rect3 Transform::xform_inv(const Rect3 &p_aabb) const {
 	return ret;
 }
 
-#ifdef OPTIMIZED_TRANSFORM_IMPL_OVERRIDE
-
-#else
-
-struct OptimizedTransform {
-
-	Transform transform;
-
-	_FORCE_INLINE_ void invert() { transform.invert(); }
-	_FORCE_INLINE_ void affine_invert() { transform.affine_invert(); }
-	_FORCE_INLINE_ Vector3 xform(const Vector3 &p_vec) const { return transform.xform(p_vec); };
-	_FORCE_INLINE_ Vector3 xform_inv(const Vector3 &p_vec) const { return transform.xform_inv(p_vec); };
-	_FORCE_INLINE_ OptimizedTransform operator*(const OptimizedTransform &p_ot) const { return OptimizedTransform(transform * p_ot.transform); }
-	_FORCE_INLINE_ Transform get_transform() const { return transform; }
-	_FORCE_INLINE_ void set_transform(const Transform &p_transform) { transform = p_transform; }
-
-	OptimizedTransform(const Transform &p_transform) {
-		transform = p_transform;
-	}
-};
-
-#endif
-
 #endif
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp
index 67e4673ad6..733854a15e 100644
--- a/core/variant_parser.cpp
+++ b/core/variant_parser.cpp
@@ -755,7 +755,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
 			Image::Format format = Image::FORMAT_MAX;
 
 			for (int i = 0; i < Image::FORMAT_MAX; i++) {
-				if (Image::get_format_name(format) == sformat) {
+				if (Image::get_format_name(Image::Format(i)) == sformat) {
 					format = Image::Format(i);
 				}
 			}