[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35757] trunk/blender: Bugfix 26578

[Ton Roosendaal]

Revision: 35757
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35757
Author:   ton
Date:     2011-03-24 18:39:54 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Bugfix 26578

"Warp" texture map option didnt work for new bump methods yet.
Also fixed to not grey out bump menu for this mapping option.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
    trunk/blender/source/blender/render/intern/source/render_texture.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2011-03-24 17:17:44 UTC (rev 35756)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_texture.py	2011-03-24 18:39:54 UTC (rev 35757)
@@ -1015,7 +1015,7 @@
 
             # 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")
 

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2011-03-24 17:17:44 UTC (rev 35756)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2011-03-24 18:39:54 UTC (rev 35757)
@@ -2339,9 +2339,16 @@
 				}
 				// 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