From a2c182e9233333fc3b8ff40d352113ec95e7e30c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 3 Mar 2012 16:31:46 +0000 Subject: style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide). --- .../blender/editors/space_outliner/outliner_draw.c | 8 ++++--- .../editors/space_outliner/outliner_intern.h | 28 +++++++++++----------- .../editors/space_outliner/outliner_select.c | 2 +- .../editors/space_outliner/outliner_tools.c | 8 +++---- .../blender/editors/space_outliner/outliner_tree.c | 6 ++--- 5 files changed, 27 insertions(+), 25 deletions(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index bb694ae5705..1a08df79664 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -127,11 +127,13 @@ static void outliner_rna_width(SpaceOops *soops, ListBase *lb, int *w, int start TreeElement *te= lb->first; while(te) { TreeStoreElem *tselem= TREESTORE(te); - // XXX fixme... (currently, we're using a fixed length of 100)! - /*if(te->xend) { + // XXX fixme... (currently, we're using a fixed length of 100)! +#if 0 + if(te->xend) { if(te->xend > *w) *w = te->xend; - }*/ + } +#endif if(startx+100 > *w) *w = startx+100; diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 8c53e9ad111..b1990d3054e 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -127,20 +127,20 @@ typedef struct TreeElement { /* Outliner Searching -- - - Are we looking for something in the outliner? - If so finding matches in child items makes it more useful - - - We want to flag parents to act as being open to filter child matches - - and also flag matches so we can highlight them - - Flags are stored in TreeStoreElem->flag - - Flag options defined in DNA_outliner_types.h - - SO_SEARCH_RECURSIVE defined in DNA_space_types.h - - - NOT in datablocks view - searching all datablocks takes way too long - to be useful - - not searching into RNA items helps but isn't the complete solution - */ + * + * Are we looking for something in the outliner? + * If so finding matches in child items makes it more useful + * + * - We want to flag parents to act as being open to filter child matches + * - and also flag matches so we can highlight them + * - Flags are stored in TreeStoreElem->flag + * - Flag options defined in DNA_outliner_types.h + * - SO_SEARCH_RECURSIVE defined in DNA_space_types.h + * + * - NOT in datablocks view - searching all datablocks takes way too long + * to be useful + * - not searching into RNA items helps but isn't the complete solution + */ #define SEARCHING_OUTLINER(sov) (sov->search_flags & SO_SEARCH_RECURSIVE) diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 345e7a835f4..a71ea9a6d4a 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -664,7 +664,7 @@ int tree_element_active(bContext *C, Scene *scene, SpaceOops *soops, TreeElement switch(te->idcode) { /* Note: no ID_OB: objects are handled specially to allow multiple - selection. See do_outliner_item_activate. */ + * selection. See do_outliner_item_activate. */ case ID_MA: return tree_element_active_material(C, scene, soops, te, set); case ID_WO: diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 09a125692d2..c8da45270b7 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -576,10 +576,10 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op) outliner_do_object_operation(C, scene, soops, &soops->tree, object_delete_cb); /* XXX: tree management normally happens from draw_outliner(), but when - you're clicking to fast on Delete object from context menu in - outliner several mouse events can be handled in one cycle without - handling notifiers/redraw which leads to deleting the same object twice. - cleanup tree here to prevent such cases. */ + * you're clicking to fast on Delete object from context menu in + * outliner several mouse events can be handled in one cycle without + * handling notifiers/redraw which leads to deleting the same object twice. + * cleanup tree here to prevent such cases. */ outliner_cleanup_tree(soops); DAG_scene_sort(bmain, scene); diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 7f3a8694d68..56cfcf9e18a 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -644,7 +644,7 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor for(a=0; atotcol; a++) outliner_add_element(soops, &te->subtree, me->mat[a], te, 0, a); /* could do tfaces with image links, but the images are not grouped nicely. - would require going over all tfaces, sort images in use. etc... */ + * would require going over all tfaces, sort images in use. etc... */ } break; case ID_CU: @@ -1412,8 +1412,8 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops) int show_opened= (soops->treestore==NULL); /* on first view, we open scenes */ /* Are we looking for something - we want to tag parents to filter child matches - - NOT in datablocks view - searching all datablocks takes way too long to be useful - - this variable is only set once per tree build */ + * - NOT in datablocks view - searching all datablocks takes way too long to be useful + * - this variable is only set once per tree build */ if(soops->search_string[0]!=0 && soops->outlinevis!=SO_DATABLOCKS) soops->search_flags |= SO_SEARCH_RECURSIVE; else -- cgit v1.2.3