Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM.G. Kishalmi <lmg@kishalmi.net>2011-01-30 19:24:23 +0300
committerM.G. Kishalmi <lmg@kishalmi.net>2011-01-30 19:24:23 +0300
commitd5da54e1e648c264cadc77fd43d80d4ef29688f2 (patch)
treeb6be3559c92bc05fda6aace64055920865ef7948 /source/blender/blenkernel/intern/texture.c
parent658f86b01679650f8c0ff6d3998004df2235573f (diff)
bugfix #25867
fix for objectspace bumpmapping
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
-rw-r--r--source/blender/blenkernel/intern/texture.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 48903fa5f5f..de08a3b1813 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -630,8 +630,7 @@ void default_mtex(MTex *mtex)
mtex->size[1]= 1.0;
mtex->size[2]= 1.0;
mtex->tex= 0;
- mtex->texflag= MTEX_3TAP_BUMP;
- mtex->texflag= MTEX_BUMP_OBJECTSPACE;
+ mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE;
mtex->colormodel= 0;
mtex->r= 1.0;
mtex->g= 0.0;