diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-03-12 12:04:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-03-12 12:04:07 +0300 |
| commit | c8d9d60a99188b8809612402bfa4cf2df4dda897 (patch) | |
| tree | 1c3c28af7b3bcccf717b705a2cba2fa20674e469 | |
| parent | 33a6bf610eb66ef6c306d5b8759043960edc8052 (diff) | |
Added python access to TEXFACE_ALPHA
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 2 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Material.c | 4 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/doc/Material.py | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index d885bfcae82..a4c6120374a 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -197,7 +197,7 @@ typedef struct Material { #define MA_STR_B_UNITS 0x40000000 #define MA_STR_SURFDIFF 0x80000000 -#define MA_MODE_MASK 0x4fffffff /* all valid mode bits */ +#define MA_MODE_MASK 0x6fffffff /* all valid mode bits */ /* ray mirror fadeout */ #define MA_RAYMIR_FADETOSKY 0 diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c index 8ec1a8fab06..fc697bee343 100644 --- a/source/blender/python/api2_2x/Material.c +++ b/source/blender/python/api2_2x/Material.c @@ -1,5 +1,5 @@ /* - * $Id: Material.c 12078 2007-09-18 06:41:29Z campbellbarton $ + * $Id$ * * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** * @@ -367,6 +367,8 @@ static PyObject *Material_ModesDict( void ) PyConstant_Insert(c, "TANGENT_V", PyInt_FromLong(MA_TANGENT_V)); PyConstant_Insert(c, "NMAP_TS", PyInt_FromLong(MA_NORMAP_TANG)); PyConstant_Insert(c, "GROUP_EXCLUSIVE", PyInt_FromLong(MA_GROUP_NOLAY)); + PyConstant_Insert(c, "TEXFACE_ALPHA", PyInt_FromLong(MA_FACETEXTURE_ALPHA)); + } return Modes; diff --git a/source/blender/python/api2_2x/doc/Material.py b/source/blender/python/api2_2x/doc/Material.py index 40207dd92c0..edcdbbb959b 100644 --- a/source/blender/python/api2_2x/doc/Material.py +++ b/source/blender/python/api2_2x/doc/Material.py @@ -50,6 +50,7 @@ Example:: - ONLYSHADOW - Let alpha be determined on the degree of shadow. - + HALOXALPHA - Use extreme alpha. - TEXFACE - UV-Editor assigned texture gives color and texture info for faces. + - TEXFACE_ALPHA - When TEXFACE is enabled, use the alpha as well. - + HALOSTAR - Render halo as a star. - NOMIST - Set the Material insensitive to mist. - + HALOSHADED - Let halo receive light. |