diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-01-07 17:42:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-01-07 17:42:01 +0300 |
| commit | c8e0ca44a3c5d49be01f90a49b98a9ee8f875d36 (patch) | |
| tree | 188ab5686fd7b27a258fd0b19d4ba4467f57b14a /release | |
| parent | 03e0f28ea054923d1bb682ad8cd6ee931caea89f (diff) | |
Improved bump mapping patch by M.G. Kishalmi (lmg) and M.S. Mikkelsen (sparky).
Many thanks to them!
For comparison, see here:
http://kishalmi.servus.at/3D/bumpcode/
Based on algorithm in: Mikkelsen M. S.: Simulation of Wrinkled Surfaces Revisited.
http://jbit.net/~sparky/sfgrad_bump/mm_sfgrad_bump.pdf
This fixes bugs:
#24591: Artefacts/strange normal mapping when anti-aliasing is on
#24735: Error at the Normal function.
#24962: Normals are not calculated correctly if anti-aliasing is off
#25103: Weird artefacts in Normal
This will break render compatibility a bit, but fixing this bugs would have also
done that, so in this case it should be acceptable.
Patch committed with these modifications:
* Bump method Old/3-Tap/5-Tap option in UI, 3-Tap is default
* Only compute normal perturbation vectors when needed
* Fix some middle of block variable definitions for MSVC
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/ui/properties_texture.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 194431161d3..9a44a8e6ee8 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -995,8 +995,9 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): col.prop(tex, "color", text="") if isinstance(idblock, bpy.types.Material): - # XXX, dont remove since old files have this users need to be able to disable! - col.prop(tex, "use_old_bump", text="Old Bump Mapping") + sub = col.row() + sub.prop(tex, "bump_method", text="Bump Method") + sub.active = tex.use_map_normal col = split.column() col.prop(tex, "invert", text="Negative") |