diff options
| author | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-08-19 21:15:30 +0400 |
|---|---|---|
| committer | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-08-19 21:15:30 +0400 |
| commit | c58fb76f1a043124debf2a71e6c56f2a478a0dde (patch) | |
| tree | 393c06981022e6159df7c6b9efc3b5062ab7f6af /source/blender/editors/space_outliner/outliner_intern.h | |
| parent | c57d64468bc9009a11cafdbf0cc66e83cdaa6841 (diff) | |
| parent | 3a81f23e0975ea87ade780965462ad5b15b39d95 (diff) | |
Merged 39338-39558
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 85bbbd4fffb..cf4ce9c06a8 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -124,8 +124,8 @@ typedef struct TreeElement { #define OL_TOGW OL_TOG_RESTRICT_VIEWX #define OL_RNA_COLX (UI_UNIT_X*15) -#define OL_RNA_COL_SIZEX (UI_UNIT_X*7.5) -#define OL_RNA_COL_SPACEX (UI_UNIT_X*2.5) +#define OL_RNA_COL_SIZEX (UI_UNIT_X*7.5f) +#define OL_RNA_COL_SPACEX (UI_UNIT_X*2.5f) /* outliner_tree.c ----------------------------------------------- */ @@ -143,9 +143,6 @@ void outliner_build_tree(struct Main *mainvar, struct Scene *scene, struct Space void draw_outliner(const struct bContext *C); /* outliner_select.c -------------------------------------------- */ - -void outliner_select(struct SpaceOops *soops, ListBase *lb, int *index, short *selecting); - int tree_element_type_active(struct bContext *C, struct Scene *scene, struct SpaceOops *soops, TreeElement *te, TreeStoreElem *tselem, int set); int tree_element_active(struct bContext *C, struct Scene *scene, SpaceOops *soops, TreeElement *te, int set); |