[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16119] branches/blender-2.47/source/ blender: branches/blender-2.47

[Diego Borghetti]

Revision: 16119
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16119
Author:   bdiego
Date:     2008-08-15 00:03:14 +0200 (Fri, 15 Aug 2008)

Log Message:
-----------
branches/blender-2.47

Merge from trunk:
	Revision: 16052
	Revision: 16117

Two showstopper!!, now we are ready!

Modified Paths:
--------------
    branches/blender-2.47/source/blender/render/intern/source/rayshade.c
    branches/blender-2.47/source/blender/src/buttons_logic.c

Modified: branches/blender-2.47/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/blender-2.47/source/blender/render/intern/source/rayshade.c	2008-08-14 21:16:48 UTC (rev 16118)
+++ branches/blender-2.47/source/blender/render/intern/source/rayshade.c	2008-08-14 22:03:14 UTC (rev 16119)
@@ -263,7 +263,12 @@
 	shade_input_set_shade_texco(shi);
 	
 	if(is->mode==RE_RAY_SHADOW_TRA) 
-		shade_color(shi, shr);
+		if(shi->mat->nodetree && shi->mat->use_nodes) {
+			ntreeShaderExecTree(shi->mat->nodetree, shi, shr);
+			shi->mat= vlr->mat;		/* shi->mat is being set in nodetree */
+		}
+		else
+			shade_color(shi, shr);
 	else {
 		if(shi->mat->nodetree && shi->mat->use_nodes) {
 			ntreeShaderExecTree(shi->mat->nodetree, shi, shr);

Modified: branches/blender-2.47/source/blender/src/buttons_logic.c
===================================================================
--- branches/blender-2.47/source/blender/src/buttons_logic.c	2008-08-14 21:16:48 UTC (rev 16118)
+++ branches/blender-2.47/source/blender/src/buttons_logic.c	2008-08-14 22:03:14 UTC (rev 16119)
@@ -1691,7 +1691,7 @@
 					uiDefBut(block, LABEL, 0, "Torque", xco, yco-106, 55, 19, NULL, 0, 0, 0, 0, "Sets the torque");
 					uiDefButF(block, NUM, 0, "",		xco+45, yco-106, wval, 19, oa->forcerot, -10000.0, 10000.0, 10, 0, "");
 					uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-106, wval, 19, oa->forcerot+1, -10000.0, 10000.0, 10, 0, "");
-					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-6106, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");				
+					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-106, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");				
 				}
 				
 				if ( ob->gameflag & OB_DYNAMIC )