mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2024-11-13 00:24:29 +00:00
Merge remote-tracking branch 'refs/remotes/TTimo/master'
This commit is contained in:
commit
e68e46feee
1 changed files with 3 additions and 2 deletions
|
@ -360,6 +360,7 @@ static const char *model_classnames[] =
|
||||||
{
|
{
|
||||||
"misc_model",
|
"misc_model",
|
||||||
"misc_model_static",
|
"misc_model_static",
|
||||||
|
"misc_model_breakable",
|
||||||
"misc_gamemodel",
|
"misc_gamemodel",
|
||||||
"model_static",
|
"model_static",
|
||||||
};
|
};
|
||||||
|
@ -2667,7 +2668,7 @@ void XYWnd::PaintSizeInfo( int nDim1, int nDim2, vec3_t vMinBounds, vec3_t vMaxB
|
||||||
|
|
||||||
qglEnd();
|
qglEnd();
|
||||||
|
|
||||||
qglRasterPos3f( Betwixt( vMinBounds[nDim1], vMaxBounds[nDim1] ), 0, vMinBounds[nDim2] - 20.0 / m_fScale );
|
qglRasterPos3f( Betwixt( vMinBounds[nDim1], vMaxBounds[nDim1] ), 0, vMinBounds[nDim2] - 25.0 / m_fScale );
|
||||||
g_strDim.Format( g_pDimStrings[nDim1], vSize[nDim1] );
|
g_strDim.Format( g_pDimStrings[nDim1], vSize[nDim1] );
|
||||||
gtk_glwidget_print_string( (char *) g_strDim.GetBuffer() );
|
gtk_glwidget_print_string( (char *) g_strDim.GetBuffer() );
|
||||||
|
|
||||||
|
@ -2704,7 +2705,7 @@ void XYWnd::PaintSizeInfo( int nDim1, int nDim2, vec3_t vMinBounds, vec3_t vMaxB
|
||||||
|
|
||||||
qglEnd();
|
qglEnd();
|
||||||
|
|
||||||
qglRasterPos3f( 0, Betwixt( vMinBounds[nDim1], vMaxBounds[nDim1] ), vMinBounds[nDim2] - 20.0 / m_fScale );
|
qglRasterPos3f( 0, Betwixt( vMinBounds[nDim1], vMaxBounds[nDim1] ), vMinBounds[nDim2] - 25.0 / m_fScale );
|
||||||
g_strDim.Format( g_pDimStrings[nDim1], vSize[nDim1] );
|
g_strDim.Format( g_pDimStrings[nDim1], vSize[nDim1] );
|
||||||
gtk_glwidget_print_string( (char *) g_strDim.GetBuffer() );
|
gtk_glwidget_print_string( (char *) g_strDim.GetBuffer() );
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue