diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2008-08-15 02:03:14 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2008-08-15 02:03:14 +0400 |
| commit | ebcfe0b2e2d219b4aecae4a5449213899fbb88c8 (patch) | |
| tree | be5aed784122d8dfea7d6d865e8e19185c1cd938 | |
| parent | 402449d5ae55b3eb5cc4db814dcc85b005b915dc (diff) | |
branches/blender-2.47
Merge from trunk:
Revision: 16052
Revision: 16117
Two showstopper!!, now we are ready!
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 7 | ||||
| -rw-r--r-- | source/blender/src/buttons_logic.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 1155d2ea817..c352a83d0f4 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -263,7 +263,12 @@ static void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr) 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); diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index efed6995723..5faaf697608 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -1691,7 +1691,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh 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 ) |