Showing the changes to libraries/render-utils/src/Model.cpp (1 of 1 file). Show all
Unified · Split
| @@ -2209,23 +2209,23 @@ void Model::pickPrograms(gpu::Batch& batch, RenderMode mode, bool translucent, f · 2208 unmodified lines | |||
| 2209 | if (hasSpecular) { | 2209 | if (hasSpecular) { |
| 2210 | program = _lightmapNormalSpecularMapProgram; | 2210 | program = _lightmapNormalSpecularMapProgram; |
| 2211 | locations = &_lightmapNormalSpecularMapLocations; | 2211 | locations = &_lightmapNormalSpecularMapLocations; |
| 2212 | skinProgram.reset(nullptr); | 2212 | skinProgram.reset(); |
| 2213 | skinLocations = NULL; | 2213 | skinLocations = NULL; |
| 2214 | } else { | 2214 | } else { |
| 2215 | program = _lightmapNormalMapProgram; | 2215 | program = _lightmapNormalMapProgram; |
| 2216 | locations = &_lightmapNormalMapLocations; | 2216 | locations = &_lightmapNormalMapLocations; |
| 2217 | skinProgram.reset(nullptr); | 2217 | skinProgram.reset(); |
| 2218 | skinLocations = NULL; | 2218 | skinLocations = NULL; |
| 2219 | } | 2219 | } |
| 2220 | } else if (hasSpecular) { | 2220 | } else if (hasSpecular) { |
| 2221 | program = _lightmapSpecularMapProgram; | 2221 | program = _lightmapSpecularMapProgram; |
| 2222 | locations = &_lightmapSpecularMapLocations; | 2222 | locations = &_lightmapSpecularMapLocations; |
| 2223 | skinProgram.reset(nullptr); | 2223 | skinProgram.reset(); |
| 2224 | skinLocations = NULL; | 2224 | skinLocations = NULL; |
| 2225 | } else { | 2225 | } else { |
| 2226 | program = _lightmapProgram; | 2226 | program = _lightmapProgram; |
| 2227 | locations = &_lightmapLocations; | 2227 | locations = &_lightmapLocations; |
| 2228 | skinProgram.reset(nullptr); | 2228 | skinProgram.reset(); |
| 2229 | skinLocations = NULL; | 2229 | skinLocations = NULL; |
| 2230 | } | 2230 | } |
| 2231 | } else { | 2231 | } else { |