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

Bugfix 26578

Browse Source 
"Warp" texture map option didnt work for new bump methods yet.
Also fixed to not grey out bump menu for this mapping option.
This commit is contained in:
Ton Roosendaal
2011-03-24 18:39:54 +00:00
parent dee8ba8ba1
commit 22ea604c6f
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_texture.py
View File

@@ -1015,7 +1015,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel):
# only show bump settings if activated but not for normalmap images
row = layout.row()
row.active = tex.use_map_normal and not (tex.texture.type == 'IMAGE' and tex.texture.use_normal_map)
row.active = (tex.use_map_normal or tex.use_map_warp) and not (tex.texture.type == 'IMAGE' and tex.texture.use_normal_map)
row.prop(tex, "bump_method", text="Method")

13
source/blender/render/intern/source/render_texture.c
View File

@@ -2339,9 +2339,16 @@ void do_material_tex(ShadeInput *shi)
}
// warping, local space
if(mtex->mapto & MAP_WARP) {
warpvec[0]= mtex->warpfac*texres.nor[0];
warpvec[1]= mtex->warpfac*texres.nor[1];
warpvec[2]= mtex->warpfac*texres.nor[2];
float *warpnor= texres.nor, warpnor_[3];
if(use_ntap_bump) {
VECCOPY(warpnor_, texres.nor);
warpnor= warpnor_;
normalize_v3(warpnor_);
}
warpvec[0]= mtex->warpfac*warpnor[0];
warpvec[1]= mtex->warpfac*warpnor[1];
warpvec[2]= mtex->warpfac*warpnor[2];
warpdone= 1;
}
#if 0