diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-05 17:54:25 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-05 17:54:25 +0400 |
| commit | 3f3c6f5f1fb336f8f0015d7857a1ae153fa2a80f (patch) | |
| tree | 27e2ae66dd589013c24592fe0803b440a7e014be /source/blender/editors/space_outliner | |
| parent | 887fd19894047832fbb7a7300e5fc11438b1f3b2 (diff) | |
| parent | ccd31900ab9659b6fdc035fd91bff9f508334e22 (diff) | |
Merging from trunk up to r38119.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index d204ae9da75..f74ca7f8153 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -480,6 +480,10 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc te->name= "Index Object"; te->directdata= &srl->passflag; + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_INDEXMA)); + te->name= "Index Material"; + te->directdata= &srl->passflag; + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, LOG2I(SCE_PASS_RGBA)); te->name= "Color"; te->directdata= &srl->passflag; |