diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
commit | d65ebf8c847c18f8be568eab4d5c65e7b630a40f (patch) | |
tree | 2795070d936c6ec7012a0339ea74d1d4b317c3d4 /source/blender/editors/space_outliner/outliner.c | |
parent | 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (diff) | |
parent | a03707d408b9e37cd11124c93b1516eae9522139 (diff) |
Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies. Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index bd2d591a8c8..0ce6b5d2ce2 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -1763,7 +1763,7 @@ void OUTLINER_OT_expanded_toggle(wmOperatorType *ot) ot->exec= outliner_toggle_expanded_exec; ot->poll= ED_operator_outliner_active; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* no undo or registry, UI option */ } /* --- */ @@ -1798,7 +1798,7 @@ void OUTLINER_OT_selected_toggle(wmOperatorType *ot) ot->exec= outliner_toggle_selected_exec; ot->poll= ED_operator_outliner_active; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* no undo or registry, UI option */ } /* --- */ @@ -1855,7 +1855,7 @@ void OUTLINER_OT_show_one_level(wmOperatorType *ot) ot->exec= outliner_one_level_exec; ot->poll= ED_operator_outliner_active; - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* no undo or registry, UI option */ /* properties */ RNA_def_boolean(ot->srna, "open", 1, "Open", "Expand all entries one level deep."); @@ -3050,7 +3050,7 @@ void OUTLINER_OT_show_hierarchy(wmOperatorType *ot) ot->exec= outliner_show_hierarchy_exec; ot->poll= ED_operator_outliner_active; // TODO: shouldn't be allowed in RNA views... - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* no undo or registry, UI option */ } void outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *selecting) @@ -4737,7 +4737,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene if(!(ELEM(tselem->type, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))) { // icons a bit higher - tselem_draw_icon(block, xmax, (float)startx+offsx, (float)*starty+2*ufac, tselem, te, 1.0f); + tselem_draw_icon(block, xmax, (float)startx+offsx - 0.5f*ufac, (float)*starty+2.0f*ufac, tselem, te, 1.0f); offsx+= UI_UNIT_X; } |