From 5d30f699570a694d0237dba456119ea63863431e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 14 Jun 2012 21:52:56 -0400 Subject: [PATCH] Fix max plugin compile Always include HeadSpin.h before Max.h--Max.h brings in Winsocks 1, for some reason. This creates symbol clash hell. --- Sources/Tools/MaxComponent/plCAnimParamBlock.h | 1 + Sources/Tools/MaxComponent/plComponentBase.h | 1 + Sources/Tools/MaxComponent/plPickNodeBase.h | 1 + Sources/Tools/MaxConvert/plLayerConverter.cpp | 1 + Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h | 1 + 5 files changed, 5 insertions(+) diff --git a/Sources/Tools/MaxComponent/plCAnimParamBlock.h b/Sources/Tools/MaxComponent/plCAnimParamBlock.h index 7d5a7447..5ca2f833 100644 --- a/Sources/Tools/MaxComponent/plCAnimParamBlock.h +++ b/Sources/Tools/MaxComponent/plCAnimParamBlock.h @@ -61,6 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef _plCAnimParamBlock_h #define _plCAnimParamBlock_h +#include "HeadSpin.h" #include "Max.h" #include "iparamb2.h" #include "iparamm2.h" diff --git a/Sources/Tools/MaxComponent/plComponentBase.h b/Sources/Tools/MaxComponent/plComponentBase.h index 817a51a9..7fc3e6c6 100644 --- a/Sources/Tools/MaxComponent/plComponentBase.h +++ b/Sources/Tools/MaxComponent/plComponentBase.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_COMPONENT_BASE_H #define PL_COMPONENT_BASE_H +#include "HeadSpin.h" #include "Max.h" #include "iparamb2.h" #include "iparamm2.h" diff --git a/Sources/Tools/MaxComponent/plPickNodeBase.h b/Sources/Tools/MaxComponent/plPickNodeBase.h index c45bd707..46edc80c 100644 --- a/Sources/Tools/MaxComponent/plPickNodeBase.h +++ b/Sources/Tools/MaxComponent/plPickNodeBase.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPickNodeBase_h_inc #define plPickNodeBase_h_inc +#include "HeadSpin.h" #include "max.h" #include diff --git a/Sources/Tools/MaxConvert/plLayerConverter.cpp b/Sources/Tools/MaxConvert/plLayerConverter.cpp index 3144d2c2..1b57792d 100644 --- a/Sources/Tools/MaxConvert/plLayerConverter.cpp +++ b/Sources/Tools/MaxConvert/plLayerConverter.cpp @@ -59,6 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com /////////////////////////////////////////////////////////////////////////////// +#include "HeadSpin.h" #include "Max.h" #include "stdmat.h" #include "istdplug.h" diff --git a/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h b/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h index 3c8e77b3..007c51fb 100644 --- a/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h +++ b/Sources/Tools/MaxPlasmaMtls/Materials/plClothingMtl.h @@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef PL_CLOTHINGMTL_H #define PL_CLOTHINGMTL_H +#include "HeadSpin.h" #include "Max.h" #include "iparamb2.h" #include "../resource.h"