diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-12 16:19:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-12 16:19:32 +0300 |
| commit | 00d1e56f3d7c16838c462ae837a9b74e98ff1abe (patch) | |
| tree | fa54cc7adfa95f37e06087686db6a150397b35a6 /source/blender/editors/space_outliner | |
| parent | 4dbf499be3d076cceb5332cacf9407851e41654b (diff) | |
Fix for warning introduced in passes commit, also removed some more
radiosity code.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 1142bd96dcd..da2cf2f95c3 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, short index); + TreeElement *parent, short type, int index); static void outliner_add_passes(SpaceOops *soops, TreeElement *tenla, ID *id, SceneRenderLayer *srl) @@ -564,7 +564,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, short index) + TreeElement *parent, short type, int index) { TreeElement *te; TreeStoreElem *tselem; @@ -1234,7 +1234,7 @@ int need_add_seq_dup(Sequence *seq) return(1); } -void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, short index) +void add_seq_dup(SpaceOops *soops, Sequence *seq, TreeElement *te, int 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 c3a0165f945..b29d693a09b 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -45,7 +45,8 @@ typedef struct TreeElement { ListBase subtree; float xs, ys; // do selection int store_index; // offset in tree store - short flag, index; // flag for non-saved stuff, index for data arrays + short flag; // flag for non-saved stuff + int index; // index for data arrays short idcode; // from TreeStore id short xend; // width of item display, for select char *name; |