diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-12 16:45:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-12 16:45:25 +0300 |
| commit | 9395efc02f796b0be33bb256321a3ef09a068e33 (patch) | |
| tree | 9463ebefe5466e43a98410d07579196cd80ed5e2 /source/blender/editors/space_outliner | |
| parent | 00d1e56f3d7c16838c462ae837a9b74e98ff1abe (diff) | |
Revert part of my last commit and leave emit/environment out of outliner,
there's a problem here with overflowing shorts that I'll need to fix later.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index da2cf2f95c3..38691a62d35 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -443,7 +443,7 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb) /* Prototype, see functions below */ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv, - TreeElement *parent, short type, int index); + TreeElement *parent, short type, short index); static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl) @@ -515,13 +515,15 @@ static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, Sc te->name= "Indirect"; te->directdata= &srl->passflag; + /* TODO SCE_PASS_ENVIRONMENT/EMIT overflow short.. + te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_ENVIRONMENT); te->name= "Environment"; te->directdata= &srl->passflag; te= outliner_add_element(soops, &tenla->subtree, id, tenla, TSE_R_PASS, SCE_PASS_EMIT); te->name= "Emit"; - te->directdata= &srl->passflag; + te->directdata= &srl->passflag;*/ } @@ -564,7 +566,7 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s } static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *idv, - TreeElement *parent, short type, int index) + TreeElement *parent, short type, short index) { TreeElement *te; TreeStoreElem *tselem; @@ -1234,7 +1236,7 @@ int need_add_seq_dup(Sequence *seq) return(1); } -void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, int index) +void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, short index) { TreeElement *ch; Sequence *p; diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index b29d693a09b..44b435af3bd 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -46,7 +46,7 @@ typedef struct TreeElement { float xs, ys; // do selection int store_index; // offset in tree store short flag; // flag for non-saved stuff - int index; // index for data arrays + short index; // index for data arrays short idcode; // from TreeStore id short xend; // width of item display, for select char *name; |