Index: code/starfield/starfield.cpp
===================================================================
--- code/starfield/starfield.cpp	(revision 5227)
+++ code/starfield/starfield.cpp	(working copy)
@@ -601,6 +601,7 @@
 #include "parse/parselo.h"
 #include "hud/hud.h"
 #include "hud/hudtarget.h"
+#include "graphics/gropengltexture.h"
 
 
 #define MAX_DEBRIS_VCLIPS	4
@@ -2919,8 +2920,12 @@
 	// draw the model at the player's eye with no z-buffering
 	model_set_alpha(1.0f);
 
+	gr_opengl_set_texture_addressing(TMAP_ADDRESS_CLAMP);
+
 	model_render(Nmodel_num, &vmd_identity_matrix, &Eye_position, flags);	
 
+	gr_opengl_set_texture_addressing(TMAP_ADDRESS_WRAP);
+
 	if (Nmodel_bitmap >= 0)
 		model_set_forced_texture(-1);
 }

Index: code/fred2/bgbitmapdlg.cpp
===================================================================
--- code/fred2/bgbitmapdlg.cpp	(revision 5657)
+++ code/fred2/bgbitmapdlg.cpp	(working copy)
@@ -71,6 +71,7 @@
 	m_sky_flag_3 = The_mission.skybox_flags & MR_NO_ZBUFFER ? 1 : 0;
 	m_sky_flag_4 = The_mission.skybox_flags & MR_NO_CULL ? 1 : 0;
 	m_sky_flag_5 = The_mission.skybox_flags & MR_NO_GLOWMAPS ? 1 : 0;
+	m_sky_flag_6 = The_mission.skybox_flags & MR_FORCE_CLAMP ? 1 : 0;
 	//}}AFX_DATA_INIT
 }
 
@@ -128,6 +129,7 @@
 	DDX_Check(pDX, IDC_SKY_FLAG_NO_ZBUFF, m_sky_flag_3);
 	DDX_Check(pDX, IDC_SKY_FLAG_NO_CULL, m_sky_flag_4);
 	DDX_Check(pDX, IDC_SKY_FLAG_NO_GLOW, m_sky_flag_5);
+	DDX_Check(pDX, IDC_SKY_FLAG_CLAMP, m_sky_flag_6);
 	//}}AFX_DATA_MAP
 }
 
@@ -415,6 +417,9 @@
 	if(m_sky_flag_5) {
 		The_mission.skybox_flags |= MR_NO_GLOWMAPS;
 	}
+	if(m_sky_flag_6) {
+		The_mission.skybox_flags |= MR_FORCE_CLAMP;
+	}
 
 	// close sun data
 	sun_data_close();
Index: code/fred2/bgbitmapdlg.h
===================================================================
--- code/fred2/bgbitmapdlg.h	(revision 5657)
+++ code/fred2/bgbitmapdlg.h	(working copy)
@@ -82,6 +82,7 @@
 	int m_sky_flag_3;
 	int m_sky_flag_4;
 	int m_sky_flag_5;
+	int m_sky_flag_6;
 	CString m_skybox_model;
 	CString m_envmap;
 	//}}AFX_DATA
Index: code/fred2/fred.rc
===================================================================
--- code/fred2/fred.rc	(revision 5657)
+++ code/fred2/fred.rc	(working copy)
@@ -1378,6 +1378,7 @@
     PUSHBUTTON      "Skybox Model",IDC_SKYBOX_MODEL,228,268,78,14
     CONTROL         "No Lighting",IDC_SKY_FLAG_NO_LIGHTING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,239,296,52,10
     CONTROL         "Transparent",IDC_SKY_FLAG_XPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,297,296,54,10
+	CONTROL			"Force clamp",IDC_SKY_FLAG_CLAMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,351,296,54,10
     CONTROL         "No Z-Buffer",IDC_SKY_FLAG_NO_ZBUFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,239,309,53,10
     CONTROL         "No Cull",IDC_SKY_FLAG_NO_CULL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,297,309,39,10
     CONTROL         "No Glowmaps",IDC_SKY_FLAG_NO_GLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,351,309,60,10
Index: code/fred2/resource.h
===================================================================
--- code/fred2/resource.h	(revision 5657)
+++ code/fred2/resource.h	(working copy)
@@ -1119,6 +1119,7 @@
 #define IDC_SKY_FLAG_NO_ZBUFF           1611
 #define IDC_SKY_FLAG_NO_CULL            1612
 #define IDC_SKY_FLAG_NO_GLOW            1613
+#define IDC_SKY_FLAG_CLAMP				1614
 #define IDC_TURRETS_LOCKED              1615
 #define IDC_AFTERBURNER_LOCKED          1616
 #define IDC_FORCE_SHIELDS               1617
Index: code/lab/lab.cpp
===================================================================
--- code/lab/lab.cpp	(revision 5657)
+++ code/lab/lab.cpp	(working copy)
@@ -1638,6 +1638,7 @@
 	ADD_RENDER_FLAG("No Lighting", Lab_model_flags, MR_NO_LIGHTING);
 	ADD_RENDER_FLAG("No Z-Buffer", Lab_model_flags, MR_NO_ZBUFFER);
 	ADD_RENDER_FLAG("No Culling", Lab_model_flags, MR_NO_CULL);
+	ADD_RENDER_FLAG("Force Clamp", Lab_model_flags, MR_FORCE_CLAMP);
 	ADD_RENDER_FLAG("Show Full Detail", Lab_model_flags, MR_FULL_DETAIL);
 	ADD_RENDER_FLAG("Show Pivots", Lab_model_flags, MR_SHOW_PIVOTS);
 	ADD_RENDER_FLAG("Show Paths", Lab_model_flags, MR_SHOW_PATHS);
Index: code/model/model.h
===================================================================
--- code/model/model.h	(revision 5657)
+++ code/model/model.h	(working copy)
@@ -762,6 +762,7 @@
 #define MR_SHOW_OUTLINE_HTL			(1<<26)		// Show outlines (wireframe view) using HTL method
 #define MR_NO_GLOWMAPS				(1<<27)		// disable rendering of glowmaps - taylor
 #define MR_FULL_DETAIL				(1<<28)		// render all valid objects, particularly ones that are otherwise in/out of render boxes - taylor
+#define MR_FORCE_CLAMP				(1<<29)		// force clamp - Hery
 
 // old/obsolete flags
 //#define MR_SHOW_DAMAGE			(1<<4)		// Show the "destroyed" subobjects
Index: code/model/modelinterp.cpp
===================================================================
--- code/model/modelinterp.cpp	(revision 5657)
+++ code/model/modelinterp.cpp	(working copy)
@@ -2375,6 +2375,8 @@
 
 	model_do_dumb_rotation(model_num);
 
+	if (flags & MR_FORCE_CLAMP)
+		gr_screen.gf_set_texture_addressing(TMAP_ADDRESS_CLAMP);
 
 	int time = timestamp();
 	for (int i = 0; i < pm->n_glow_point_banks; i++ ) { //glow point blink code -Bobboau
@@ -2478,6 +2480,9 @@
 	if(The_mission.flags & MISSION_FLAG_FULLNEB){
 		gr_fog_set(GR_FOGMODE_NONE, 0, 0, 0);
 	}
+
+	if (flags & MR_FORCE_CLAMP)
+		gr_screen.gf_set_texture_addressing(TMAP_ADDRESS_WRAP);
 }
 
 /*
Index: code/model/modelread.cpp
===================================================================
--- code/model/modelread.cpp	(revision 5657)
+++ code/model/modelread.cpp	(working copy)
@@ -44,7 +44,8 @@
 	{"transparent",		MR_ALL_XPARENT},
 	{"no Zbuffer",		MR_NO_ZBUFFER},
 	{"no cull",			MR_NO_CULL},
-	{"no glowmaps",		MR_NO_GLOWMAPS}
+	{"no glowmaps",		MR_NO_GLOWMAPS},
+	{"force clamp",		MR_FORCE_CLAMP},
 };
   	 
 int model_render_flags_size = sizeof(model_render_flags)/sizeof(flag_def_list);