3 files changed, 19 insertions, 2 deletions
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 8d07737f..e4758a96 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -8,6 +8,7 @@
 #include "NodeName.h"
 #include "VisibilityPlugins.h"
 #include "ModelInfo.h"
+#include "custompipes.h"
 
 //--MIAMI: file done
 
@@ -39,6 +40,9 @@ RwObjectNameIdAssocation CPedModelInfo::m_pPedIds[PED_NODE_MAX] = {
 void
 CPedModelInfo::SetClump(RpClump *clump)
 {
+#ifdef EXTENDED_PIPELINES
+	CustomPipes::AttachRimPipe(clump);
+#endif
 	CClumpModelInfo::SetClump(clump);
 	SetFrameIds(m_pPedIds);	// not needed in VC actually
 	if(m_hitColModel == nil)
diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp
index a7e6d56c..2e6e557e 100644
--- a/src/modelinfo/SimpleModelInfo.cpp
+++ b/src/modelinfo/SimpleModelInfo.cpp
@@ -4,6 +4,7 @@
 #include "Camera.h"
 #include "ModelInfo.h"
 #include "AnimManager.h"
+#include "custompipes.h"
 
 //--MIAMI: file done
 
@@ -88,6 +89,13 @@ CSimpleModelInfo::SetAtomic(int n, RpAtomic *atomic)
 	if(RpGeometryGetFlags(geo) & rpGEOMETRYNORMALS &&
 	   RpGeometryGetNumTriangles(geo) > 200)
 		debug("%s has %d polys\n", m_name, RpGeometryGetNumTriangles(geo));
+
+#ifdef EXTENDED_PIPELINES
+	if(m_wetRoadReflection)
+		CustomPipes::AttachGlossPipe(atomic);
+	else
+		CustomPipes::AttachWorldPipe(atomic);
+#endif
 }
 
 void
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 11f78495..5d69a921 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -19,6 +19,7 @@
 #include "Bike.h"
 #include "ModelIndices.h"
 #include "ModelInfo.h"
+#include "custompipes.h"
 
 //--MIAMI: done
 
@@ -210,7 +211,7 @@ CVehicleModelInfo::CreateInstance(void)
 		clumpframe = RpClumpGetFrame(clump);
 
 		comp1 = ChooseComponent();
-		if(comp1 != -1){
+		if(comp1 != -1 && m_comps[comp1]){
 			atomic = RpAtomicClone(m_comps[comp1]);
 			f = RwFrameCreate();
 			RwFrameTransform(f,
@@ -223,7 +224,7 @@ CVehicleModelInfo::CreateInstance(void)
 		ms_compsUsed[0] = comp1;
 
 		comp2 = ChooseSecondComponent();
-		if(comp2 != -1){
+		if(comp2 != -1 && m_comps[comp2]){
 			atomic = RpAtomicClone(m_comps[comp2]);
 			f = RwFrameCreate();
 			RwFrameTransform(f,
@@ -1124,6 +1125,10 @@ CVehicleModelInfo::SetEnvironmentMap(void)
 		for(i = 0; i < wheelmi->m_numAtomics; i++)
 			SetEnvironmentMapCB(wheelmi->m_atomics[i], nil);
 	}
+
+#ifdef EXTENDED_PIPELINES
+	CustomPipes::AttachVehiclePipe(m_clump);
+#endif
 }
 
 void