archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5: merge with trunk, previous merge was only up to yesterday.

Browse Source 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
This commit is contained in:
Brecht Van Lommel
2008-11-12 22:03:11 +00:00
parent bdfe7d89e2 7e4db234ce
commit b3c238e8bc
47 changed files with 3141 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/material.c
View File

@@ -649,7 +649,7 @@ static void do_init_render_material(Material *ma, int r_mode, float *amb)
if(ma->septex & (1<<a)) continue;
mtex= ma->mtex[a];
if(mtex && mtex->tex && mtex->tex->type) {
if(mtex && mtex->tex && (mtex->tex->type | (mtex->tex->use_nodes && mtex->tex->nodetree) )) {
ma->texco |= mtex->texco;
ma->mapto |= mtex->mapto;