final merge fixes

This commit is contained in:
VB
2017-04-25 15:01:17 +02:00
parent 061be38219
commit e5ce5b001f
4 changed files with 10 additions and 9 deletions

View File

@@ -813,10 +813,10 @@ texture_manager::Bind( texture_manager::size_type const Id ) {
// having it active would lead to some terrain and spline chunks receiving wrong
// (the most recent?) texture, instead of the proper one. It'd also affect negatively
// light point rendering.
if( Id == m_activetexture ) {
// don't bind again what's already active
return;
}
//if( Id == m_activetexture ) {
// // don't bind again what's already active
// return;
//}
// TODO: do binding in texture object, add support for other types
if( Id != 0 ) {