diff --git a/.cproject b/.cproject
index 3c25bc0ba..74c750a16 100644
--- a/.cproject
+++ b/.cproject
@@ -1,117 +1,55 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
@@ -121,31 +59,34 @@
-
+
+
+
-
+
-
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
+
\ No newline at end of file
diff --git a/.project b/.project
index 3c177e262..55f0499c8 100644
--- a/.project
+++ b/.project
@@ -5,14 +5,9 @@
-
- org.python.pydev.PyDevBuilder
-
-
-
org.eclipse.cdt.managedbuilder.core.genmakebuilder
- clean,full,incremental,
+ full,incremental,
@@ -28,13 +23,12 @@
org.eclipse.cdt.core.ccnature
org.eclipse.cdt.managedbuilder.core.managedBuildNature
org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
- org.python.pydev.pythonNature
- 1404663489032
+ 1604374596782
- 10
+ 30
org.eclipse.ui.ide.multiFilter
1.0-name-matches-false-false-apple/target
diff --git a/libs/picomodel/pm_fm.c b/libs/picomodel/pm_fm.c
index 716a89d00..e0e01ca90 100644
--- a/libs/picomodel/pm_fm.c
+++ b/libs/picomodel/pm_fm.c
@@ -210,7 +210,7 @@ static picoModel_t *_fm_load( PM_PARAMS_LOAD ){
fm_xyz_st_t *triangle;
fm_frame_t *frame;
- picoByte_t *bb, bb0;
+ picoByte_t *bb, *bb0;
picoModel_t *picoModel;
picoSurface_t *picoSurface;
picoShader_t *picoShader;
diff --git a/radiant/pluginmanager.cpp b/radiant/pluginmanager.cpp
index 3fc2746f1..fc2ed18f1 100644
--- a/radiant/pluginmanager.cpp
+++ b/radiant/pluginmanager.cpp
@@ -92,7 +92,7 @@ virtual void addType( const char* key, filetype_t type ){
virtual void getTypeList( const char* key, IFileTypeList* typelist ){
filetype_list_t& list_ref = m_typelists[key];
- if (key == "model") {
+ if ( g_strcmp0( key, "model" ) == 0 ) {
// Get the list of all supported types (adapted from kaz)
CString allTypesFilter;
for (unsigned int i = 0; i < list_ref.size(); ++i) {
diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index b686f6f3c..04cddcb49 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1488,7 +1488,13 @@ void SelectTexture( int mx, int my, bool bShift, bool bFitScale ){
tex.scale[0] = g_PrefsDlg.m_fDefTextureScale;
tex.scale[1] = g_PrefsDlg.m_fDefTextureScale;
}
- tex.flags = pCurrentShader->getFlags();
+ // jdolan - idTech2 games use shaders purely for editing convenience (e.g. QER_TRANS)
+ // these flags should not be set on idTech2 faces, as they collide with e.g. SURF_LIGHT
+ if ( g_pGameDescription->idTech2 ) {
+ tex.flags = 0;
+ } else {
+ tex.flags = pCurrentShader->getFlags();
+ }
// TTimo - shader code cleanup
// texdef.name is the name of the shader, not the name of the actual texture file
tex.SetName( pCurrentShader->getName() );