fix a warning; NULL out the unused faces of misc_models (apparently this changes...

git-svn-id: svn://svn.icculus.org/netradiant/trunk@137 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 2fd078830b64584f2cec84ab7faae9dac4bb7bc8..3d167025191cf816adb71dd77a99e775f8f77969 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -806,7 +806,7 @@ GtkWindow* PrefsDlg::BuildDialog()
 
           {
             GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
-            GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes("Preferences", renderer, "text", 0, 0);
+            GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes("Preferences", renderer, "text", 0, NULL);
             gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
           }
 

diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c
index 92000684588a7eb5d0447ba71e5e527d348082d9..f2a04c100ded074c257c371c856ca2f57661eaae 100644 (file)
--- a/tools/quake3/q3map2/model.c
+++ b/tools/quake3/q3map2/model.c
@@ -544,8 +544,9 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade
                                        {
                                                /* set up brush sides */
                                                buildBrush->numsides = 5;
-                                               for( j = 0; j < buildBrush->numsides; j++ )
-                                                       buildBrush->sides[ j ].shaderInfo = si;
+                                               buildBrush->sides[ 0 ].shaderInfo = si;
+                                               for( j = 1; j < buildBrush->numsides; j++ )
+                                                       buildBrush->sides[ j ].shaderInfo = NULL; // don't emit these faces as draw surfaces, should make smaller BSPs; hope this works
 
                                                buildBrush->sides[ 0 ].planenum = FindFloatPlane( plane, plane[ 3 ], 3, points );
                                                buildBrush->sides[ 1 ].planenum = FindFloatPlane( pa, pa[ 3 ], 2, &points[ 1 ] ); // pa contains points[1] and points[2]