diff options
| author | Joshua Leung <aligorith@gmail.com> | 2006-12-31 10:26:23 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2006-12-31 10:26:23 +0300 |
| commit | 75735b839bceb2a93404f5a236cdc9bcabcf062f (patch) | |
| tree | 2dc5456681d00da4715b11990680f365c568c024 | |
| parent | 2dd1c967613bdf8e34750d4c2e851976504129bf (diff) | |
== Bugfix #5550 ==
* UV and Radiosity passes are now visible in Outliner (like for other passes)
* Changed tooltip of overwrite material to:
"Name of Material to use as Materials instead"
* Also, fixed Reflection and Refraction passes in the Outliner - flags were
mixed up, so turning on Reflection turned on Refraction and vica-versa.
| -rw-r--r-- | source/blender/src/buttons_scene.c | 2 | ||||
| -rw-r--r-- | source/blender/src/outliner.c | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 9a4d3514e9d..5a22feccf11 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1840,7 +1840,7 @@ static void render_panel_layers(void) uiDefButBitI(block, TOG, SCE_LAY_EDGE, B_NOP,"Edge", 260, 85, 50, 20, &srl->layflag, 0, 0, 0, 0, "Render Edge-enhance in this Layer (only works for Solid faces)"); uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_SET_PASS, "Light:", 10, 65, 150, 20, &(srl->light_override), "Name of Group to use as Lamps instead"); - uiDefIDPoinBut(block, test_matpoin_but, ID_MA, B_SET_PASS, "Mat:", 160, 65, 150, 20, &(srl->mat_override), "Name of Material to use as Lamps instead"); + uiDefIDPoinBut(block, test_matpoin_but, ID_MA, B_SET_PASS, "Mat:", 160, 65, 150, 20, &(srl->mat_override), "Name of Material to use as Materials instead"); uiBlockEndAlign(block); uiBlockBeginAlign(block); diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 531014ca38d..6ea41e8c4b5 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -424,6 +424,10 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc te->name= "Normal"; te->directdata= &srl->passflag; + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_UV); + te->name= "UV"; + te->directdata= &srl->passflag; + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_INDEXOB); te->name= "Index Object"; te->directdata= &srl->passflag; @@ -448,14 +452,18 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc te->name= "AO"; te->directdata= &srl->passflag; - te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_REFRACT); + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_REFLECT); te->name= "Reflection"; te->directdata= &srl->passflag; - te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_REFLECT); + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_REFRACT); te->name= "Refraction"; te->directdata= &srl->passflag; + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_RADIO); + te->name= "Radiosity"; + te->directdata= &srl->passflag; + } |