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

Bugfix #4341

Browse Source 
The code added to ensure Image textures in nodes use the correct mapping
settings (UV, repeat, etc) crashed when editing non-osa cases.
This commit is contained in:
Ton Roosendaal
2006-06-16 12:33:35 +00:00
parent 333eae5b03
commit a33798d697
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/render/intern/source/texture.c
View File

@@ -1253,8 +1253,14 @@ int multitex_ext(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, Te
mtex.texco= TEXCO_ORCO;
VECCOPY(texvec_l, texvec);
VECCOPY(dxt_l, dxt);
VECCOPY(dyt_l, dyt);
if(dxt && dyt) {
VECCOPY(dxt_l, dxt);
VECCOPY(dyt_l, dyt);
}
else {
dxt_l[0]= dxt_l[1]= dxt_l[2]= 0.0f;
dyt_l[0]= dyt_l[1]= dyt_l[2]= 0.0f;
}
do_2d_mapping(&mtex, texvec_l, NULL, dxt_l, dyt_l);