Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(575)

Unified Diff: source/gameengine/Ketsji/BL_Material.h

Issue 4289041: BGE: Material replacement for texface options (Closed) Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Final patch - to be committed tomorrow morning Created 12 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/gameengine/Ketsji/BL_BlenderShader.cpp ('k') | source/gameengine/Ketsji/BL_Material.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/gameengine/Ketsji/BL_Material.h
===================================================================
--- source/gameengine/Ketsji/BL_Material.h (revision 40340)
+++ source/gameengine/Ketsji/BL_Material.h (working copy)
@@ -68,7 +68,7 @@
float matcolor[4];
float speccolor[3];
- short transp, pad;
+ short alphablend, pad;
float hard, spec_f;
float alpha, emit, color_blend[MAXTEX], ref;
@@ -76,7 +76,6 @@
int blend_mode[MAXTEX];
- int mode;
int num_enabled;
BL_Mapping mapping[MAXTEX];
@@ -151,14 +150,16 @@
// BL_Material::ras_mode
enum BL_ras_mode
{
- POLY_VIS=1,
+ // POLY_VIS=1,
COLLIDER=2,
ZSORT=4,
ALPHA=8,
// TRIANGLE=16,
USE_LIGHT=32,
WIRE=64,
- CAST_SHADOW=128
+ CAST_SHADOW=128,
+ TEX=256,
+ TWOSIDED=512
};
// -------------------------------------
« no previous file with comments | « source/gameengine/Ketsji/BL_BlenderShader.cpp ('k') | source/gameengine/Ketsji/BL_Material.cpp » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b