projects
/
blender.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merged changes in the trunk up to revision 27992.
[blender.git]
/
source
/
blender
/
blenkernel
/
intern
/
material.c
diff --git
a/source/blender/blenkernel/intern/material.c
b/source/blender/blenkernel/intern/material.c
index 3b17ac1db1ae7f7dfec0f07d01eb59af4bfc84b6..1aa68bb832f60a602c5a0f1a1a51a0bdde5c387a 100644
(file)
--- a/
source/blender/blenkernel/intern/material.c
+++ b/
source/blender/blenkernel/intern/material.c
@@
-140,6
+140,7
@@
void init_material(Material *ma)
ma->tx_limit= 0.0;
ma->tx_falloff= 1.0;
ma->shad_alpha= 1.0f;
+ ma->vcol_alpha= 0;
ma->gloss_mir = ma->gloss_tra= 1.0;
ma->samp_gloss_mir = ma->samp_gloss_tra= 18;