|
@@ -97,9 +97,12 @@ AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
|
|
|
if (prop->mType != aiPTI_Buffer) {
|
|
|
return AI_FAILURE;
|
|
|
}
|
|
|
-
|
|
|
+// std::min has in some cases a conflict with a defined min
|
|
|
+#ifdef min
|
|
|
+# undef min
|
|
|
+#endif
|
|
|
iNum = static_cast<unsigned int>(std::min(static_cast<size_t>(iNum),prop->mDataLength / sizeof(Type)));
|
|
|
- ::memcpy(pOut,prop->mData,iNum * sizeof(Type));
|
|
|
+ std::memcpy(pOut,prop->mData,iNum * sizeof(Type));
|
|
|
if (pMax) {
|
|
|
*pMax = iNum;
|
|
|
}
|