Merge commit '7ca7a54fe6db387a22ea979e62ecbbb30f6d6d30' into garux-merge

diff --cc radiant/renderstate.cpp
Simple merge

diff --cc tools/quake3/q3map2/bsp.c
Simple merge

diff --cc tools/quake3/q3map2/bspfile_abstract.c
Simple merge

diff --cc tools/quake3/q3map2/light.c
Simple merge

diff --cc tools/quake3/q3map2/q3map2.h
index bf1fee3deda57d822697c3c35e1b28e1dcc5a7cf,5221bb4f4234cb01c7230206496ca277f4e47492..13496b977afecf8e1f456ab324653fecc5c94321
--- 1/tools/quake3/q3map2/q3map2.h
--- 2/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -2028,9 -1999,12 +2028,12 @@@ Q_EXTERN qboolean warnImage Q_ASSIGN( q
  /* ydnar: sinusoid samples */
  Q_EXTERN float jitters[ MAX_JITTERS ];
  
+ /*can't code*/
+ Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse );
+ 
  
  /* commandline arguments */
 -Q_EXTERN qboolean                     nocmdline Q_ASSIGN( qfalse );
 +Q_EXTERN qboolean nocmdline Q_ASSIGN( qfalse );
  Q_EXTERN qboolean verbose;
  Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
  Q_EXTERN qboolean force Q_ASSIGN( qfalse );

diff --cc tools/quake3/q3map2/writebsp.c
Simple merge