fix PIMap operator<<(PIMap) error for size=2

.clang-format

@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_FINISH|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto

libs/main/containers/pimap.h

@@ -365,8 +365,8 @@ public:
 			return *this;
 		}
 		if (other.size() == 2) {
-			insert(other.pim_index[0].key, other.pim_content[0]);
-			insert(other.pim_index[1].key, other.pim_content[1]);
+			insert(other.pim_index[0].key, other.pim_content[other.pim_index[0].index]);
+			insert(other.pim_index[1].key, other.pim_content[other.pim_index[1].index]);
 			return *this;
 		}
 		for (int i = 0; i < other.pim_index.size_s(); ++i) {

libs/main/types/pivariant.cpp

@@ -712,6 +712,11 @@ int PIVariant::toInt() const {
 		ba >> r;
 		return (int)r.rgba;
 	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return r.size() > 0 ? r[0] : 0;
+	}
 	case PIVariant::pivCustom: return getAsValue<int>(*this);
 	default: break;
 	}
@@ -817,6 +822,11 @@ llong PIVariant::toLLong() const {
 		ba >> r;
 		return llong(r.selectedValue());
 	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return r.size() > 0 ? r[0] : 0L;
+	}
 	case PIVariant::pivCustom: return getAsValue<llong>(*this);
 	default: break;
 	}
@@ -922,6 +932,11 @@ float PIVariant::toFloat() const {
 		ba >> r;
 		return float(r.selectedValue());
 	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return r.size() > 0 ? r[0] : 0.f;
+	}
 	case PIVariant::pivCustom: return getAsValue<float>(*this);
 	default: break;
 	}
@@ -1027,6 +1042,11 @@ double PIVariant::toDouble() const {
 		ba >> r;
 		return double(r.selectedValue());
 	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return r.size() > 0 ? r[0] : 0.;
+	}
 	case PIVariant::pivCustom: return getAsValue<double>(*this);
 	default: break;
 	}
@@ -1132,6 +1152,11 @@ ldouble PIVariant::toLDouble() const {
 		ba >> r;
 		return ldouble(r.selectedValue());
 	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return r.size() > 0 ? r[0] : 0.;
+	}
 	case PIVariant::pivCustom: return getAsValue<float>(*this);
 	default: break;
 	}