eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 00:09:18 +02:00
Code Issues 123 Wiki Activity

changed NULL use to c++11 compliant

Browse Source
This commit is contained in:
tmj-fstate
2017-08-15 00:55:38 +02:00
parent 7068a4ceff
commit 7e51d5d2e0
27 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
material.h
View File

@@ -19,8 +19,8 @@ typedef int material_handle;
// for legacy opengl this is basically just texture(s) assigned to geometry
struct opengl_material {
texture_handle texture1 { NULL }; // primary texture, typically diffuse+apha
texture_handle texture2 { NULL }; // secondary texture, typically normal+reflection
texture_handle texture1 { null_handle }; // primary texture, typically diffuse+apha
texture_handle texture2 { null_handle }; // secondary texture, typically normal+reflection
bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1
std::string name;