remove two mysterious crashes (although I don't know why it was broken to begin with)

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

diff --git a/radiant/entity.cpp b/radiant/entity.cpp
index 7a08d0980c871bf2dc6bd8c05ad4ae5b28b721da..c9d00e401a43e779ff83560c0f729ccc436283b9 100644 (file)
--- a/radiant/entity.cpp
+++ b/radiant/entity.cpp
@@ -195,7 +195,8 @@ public:
   }
   void post(const scene::Path& path, scene::Instance& instance) const
   {
-    if(Instance_getSelectable(instance)->isSelected())
+       Selectable *selectable = Instance_getSelectable(instance);
+    if(selectable && selectable->isSelected())
     { 
          Entity* entity = Node_getEntity(path.top());
          if(entity == 0 && Node_isPrimitive(path.top()))

diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c
index 82968420ce57cd5e2e28b854bfde5ba2af281c90..c7c8363d2e5b7eb5162e6a8409d1527d9361fc15 100644 (file)
--- a/tools/quake3/q3map2/surface.c
+++ b/tools/quake3/q3map2/surface.c
@@ -181,6 +181,7 @@ mapDrawSurface_t *MakeCelSurface( mapDrawSurface_t *src, shaderInfo_t *si )
        /* do some fixups for celshading */
        ds->planar = qfalse;
        ds->planeNum = -1;
+       ds->celShader = NULL; /* don't cel shade cels :P */
        
        /* return the surface */
        return ds;