Cleanup: Use C-style comments in outliner files
No functional changes. Convert all C++ style comments to C comments. Also capitalize and add full stops. The comments themselves were not cleaned up. Some could be removed or reworded.
This commit is contained in:
@@ -80,8 +80,8 @@
|
||||
|
||||
#include "outliner_intern.h"
|
||||
|
||||
/* disable - this is far too slow - campbell */
|
||||
// #define USE_GROUP_SELECT
|
||||
/* Disable - this is far too slow - campbell. */
|
||||
/* #define USE_GROUP_SELECT */
|
||||
|
||||
/* ****************************************************** */
|
||||
/* Tree Size Functions */
|
||||
@@ -731,7 +731,7 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
|
||||
else {
|
||||
switch (tselem->type) {
|
||||
case TSE_DEFGROUP:
|
||||
BKE_object_defgroup_unique_name(te->directdata, (Object *)tselem->id); // id = object
|
||||
BKE_object_defgroup_unique_name(te->directdata, (Object *)tselem->id); /* id = object. */
|
||||
break;
|
||||
case TSE_NLA_ACTION:
|
||||
BLI_libblock_ensure_unique_name(bmain, tselem->id->name);
|
||||
@@ -790,7 +790,7 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
|
||||
break;
|
||||
}
|
||||
case TSE_POSEGRP: {
|
||||
Object *ob = (Object *)tselem->id; // id = object
|
||||
Object *ob = (Object *)tselem->id; /* id = object. */
|
||||
bActionGroup *grp = te->directdata;
|
||||
|
||||
BLI_uniquename(&ob->pose->agroups,
|
||||
@@ -809,7 +809,7 @@ static void namebutton_fn(bContext *C, void *tsep, char *oldname)
|
||||
/* always make layer active */
|
||||
BKE_gpencil_layer_active_set(gpd, gpl);
|
||||
|
||||
// XXX: name needs translation stuff
|
||||
/* XXX: name needs translation stuff. */
|
||||
BLI_uniquename(
|
||||
&gpd->layers, gpl, "GP Layer", '.', offsetof(bGPDlayer, info), sizeof(gpl->info));
|
||||
|
||||
@@ -3069,7 +3069,7 @@ static void outliner_draw_tree_element(bContext *C,
|
||||
icon_border);
|
||||
GPU_blend(true); /* roundbox disables it */
|
||||
|
||||
te->flag |= TE_ACTIVE; // for lookup in display hierarchies
|
||||
te->flag |= TE_ACTIVE; /* For lookup in display hierarchies. */
|
||||
}
|
||||
|
||||
if (tselem->type == TSE_VIEW_COLLECTION_BASE) {
|
||||
@@ -3080,7 +3080,7 @@ static void outliner_draw_tree_element(bContext *C,
|
||||
/* open/close icon, only when sublevels, except for scene */
|
||||
int icon_x = startx;
|
||||
|
||||
// icons a bit higher
|
||||
/* Icons a bit higher. */
|
||||
if (TSELEM_OPEN(tselem, soops)) {
|
||||
UI_icon_draw_alpha((float)icon_x + 2 * ufac,
|
||||
(float)*starty + 1 * ufac,
|
||||
@@ -3487,7 +3487,7 @@ static void outliner_draw_tree(bContext *C,
|
||||
int starty, startx;
|
||||
|
||||
GPU_blend_set_func_separate(
|
||||
GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); // only once
|
||||
GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); /* Only once. */
|
||||
|
||||
if (soops->outlinevis == SO_DATA_API) {
|
||||
/* struct marks */
|
||||
@@ -3510,13 +3510,12 @@ static void outliner_draw_tree(bContext *C,
|
||||
GPU_scissor(0, 0, mask_x, region->winy);
|
||||
}
|
||||
|
||||
// gray hierarchy lines
|
||||
|
||||
/* Gray hierarchy lines. */
|
||||
starty = (int)region->v2d.tot.ymax - UI_UNIT_Y / 2 - OL_Y_OFFSET;
|
||||
startx = UI_UNIT_X / 2 - (U.pixelsize + 1) / 2;
|
||||
outliner_draw_hierarchy_lines(soops, &soops->tree, startx, &starty);
|
||||
|
||||
// items themselves
|
||||
/* Items themselves. */
|
||||
starty = (int)region->v2d.tot.ymax - UI_UNIT_Y - OL_Y_OFFSET;
|
||||
startx = 0;
|
||||
LISTBASE_FOREACH (TreeElement *, te, &soops->tree) {
|
||||
@@ -3621,7 +3620,7 @@ void draw_outliner(const bContext *C)
|
||||
TreeViewContext tvc;
|
||||
outliner_viewcontext_init(C, &tvc);
|
||||
|
||||
outliner_build_tree(mainvar, tvc.scene, tvc.view_layer, soops, region); // always
|
||||
outliner_build_tree(mainvar, tvc.scene, tvc.view_layer, soops, region); /* Always. */
|
||||
|
||||
/* If global sync select is dirty, flag other outliners */
|
||||
if (ED_outliner_select_sync_is_dirty(C)) {
|
||||
|
||||
@@ -1475,7 +1475,7 @@ void OUTLINER_OT_scroll_page(wmOperatorType *ot)
|
||||
|
||||
/** \} */
|
||||
|
||||
#if 0 // TODO: probably obsolete now with filtering?
|
||||
#if 0 /* TODO: probably obsolete now with filtering? */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Search
|
||||
@@ -1519,7 +1519,7 @@ static TreeElement *outliner_find_name(
|
||||
static void outliner_find_panel(
|
||||
Scene *UNUSED(scene), ARegion *region, SpaceOutliner *soops, int again, int flags)
|
||||
{
|
||||
ReportList *reports = NULL; // CTX_wm_reports(C);
|
||||
ReportList *reports = NULL; /* CTX_wm_reports(C); */
|
||||
TreeElement *te = NULL;
|
||||
TreeElement *last_find;
|
||||
TreeStoreElem *tselem;
|
||||
@@ -1546,10 +1546,10 @@ static void outliner_find_panel(
|
||||
else {
|
||||
/* pop up panel - no previous, or user didn't want search after previous */
|
||||
name[0] = '\0';
|
||||
// XXX if (sbutton(name, 0, sizeof(name) - 1, "Find: ") && name[0]) {
|
||||
// te = outliner_find_name(soops, &soops->tree, name, flags, NULL, &prevFound);
|
||||
// }
|
||||
// else return; /* XXX RETURN! XXX */
|
||||
/* XXX if (sbutton(name, 0, sizeof(name) - 1, "Find: ") && name[0]) { */
|
||||
/* te = outliner_find_name(soops, &soops->tree, name, flags, NULL, &prevFound); */
|
||||
/* } */
|
||||
/* else return; XXX RETURN! XXX */
|
||||
}
|
||||
|
||||
/* do selection and reveal */
|
||||
@@ -1764,7 +1764,7 @@ void OUTLINER_OT_show_hierarchy(wmOperatorType *ot)
|
||||
|
||||
/* callbacks */
|
||||
ot->exec = outliner_show_hierarchy_exec;
|
||||
ot->poll = ED_operator_outliner_active; // TODO: shouldn't be allowed in RNA views...
|
||||
ot->poll = ED_operator_outliner_active; /* TODO: shouldn't be allowed in RNA views... */
|
||||
|
||||
/* no undo or registry, UI option */
|
||||
}
|
||||
@@ -2050,7 +2050,7 @@ static int outliner_drivers_addsel_exec(bContext *C, wmOperator *op)
|
||||
do_outliner_drivers_editop(soutliner, &soutliner->tree, op->reports, DRIVERS_EDITMODE_ADD);
|
||||
|
||||
/* send notifiers */
|
||||
WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL); // XXX
|
||||
WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL); /* XXX */
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
@@ -2089,7 +2089,7 @@ static int outliner_drivers_deletesel_exec(bContext *C, wmOperator *op)
|
||||
do_outliner_drivers_editop(soutliner, &soutliner->tree, op->reports, DRIVERS_EDITMODE_REMOVE);
|
||||
|
||||
/* send notifiers */
|
||||
WM_event_add_notifier(C, ND_KEYS, NULL); // XXX
|
||||
WM_event_add_notifier(C, ND_KEYS, NULL); /* XXX */
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
}
|
||||
@@ -2126,8 +2126,8 @@ enum {
|
||||
KEYINGSET_EDITMODE_REMOVE,
|
||||
} /*eKeyingSet_EditModes*/;
|
||||
|
||||
/* find the 'active' KeyingSet, and add if not found (if adding is allowed) */
|
||||
// TODO: should this be an API func?
|
||||
/* Find the 'active' KeyingSet, and add if not found (if adding is allowed). */
|
||||
/* TODO: should this be an API func? */
|
||||
static KeyingSet *verify_active_keyingset(Scene *scene, short add)
|
||||
{
|
||||
KeyingSet *ks = NULL;
|
||||
@@ -2142,8 +2142,8 @@ static KeyingSet *verify_active_keyingset(Scene *scene, short add)
|
||||
ks = BLI_findlink(&scene->keyingsets, scene->active_keyingset - 1);
|
||||
}
|
||||
|
||||
/* add if none found */
|
||||
// XXX the default settings have yet to evolve
|
||||
/* Add if none found */
|
||||
/* XXX the default settings have yet to evolve. */
|
||||
if ((add) && (ks == NULL)) {
|
||||
ks = BKE_keyingset_add(&scene->keyingsets, NULL, NULL, KEYINGSET_ABSOLUTE, 0);
|
||||
scene->active_keyingset = BLI_listbase_count(&scene->keyingsets);
|
||||
|
||||
@@ -63,15 +63,15 @@ typedef TreeTraversalAction (*TreeTraversalFunc)(struct TreeElement *te, void *c
|
||||
typedef struct TreeElement {
|
||||
struct TreeElement *next, *prev, *parent;
|
||||
ListBase subtree;
|
||||
int xs, ys; // do selection
|
||||
TreeStoreElem *store_elem; // element in tree store
|
||||
short flag; // flag for non-saved stuff
|
||||
short index; // index for data arrays
|
||||
short idcode; // from TreeStore id
|
||||
short xend; // width of item display, for select
|
||||
int xs, ys; /* Do selection. */
|
||||
TreeStoreElem *store_elem; /* Element in tree store. */
|
||||
short flag; /* Flag for non-saved stuff. */
|
||||
short index; /* Index for data arrays. */
|
||||
short idcode; /* From TreeStore id. */
|
||||
short xend; /* Width of item display, for select. */
|
||||
const char *name;
|
||||
void *directdata; // Armature Bones, Base, Sequence, Strip...
|
||||
PointerRNA rnaptr; // RNA Pointer
|
||||
void *directdata; /* Armature Bones, Base, Sequence, Strip... */
|
||||
PointerRNA rnaptr; /* RNA Pointer. */
|
||||
} TreeElement;
|
||||
|
||||
typedef struct TreeElementIcon {
|
||||
|
||||
@@ -455,7 +455,7 @@ static eOLDrawState tree_element_active_material(bContext *C,
|
||||
|
||||
/* we search for the object parent */
|
||||
ob = (Object *)outliner_search_back(te, ID_OB);
|
||||
// note: ob->matbits can be NULL when a local object points to a library mesh.
|
||||
/* Note : ob->matbits can be NULL when a local object points to a library mesh. */
|
||||
if (ob == NULL || ob != OBACT(view_layer) || ob->matbits == NULL) {
|
||||
return OL_DRAWSEL_NONE; /* just paranoia */
|
||||
}
|
||||
@@ -465,7 +465,7 @@ static eOLDrawState tree_element_active_material(bContext *C,
|
||||
if (tes->idcode == ID_OB) {
|
||||
if (set != OL_SETSEL_NONE) {
|
||||
ob->actcol = te->index + 1;
|
||||
ob->matbits[te->index] = 1; // make ob material active too
|
||||
ob->matbits[te->index] = 1; /* Make ob material active too. */
|
||||
}
|
||||
else {
|
||||
if (ob->actcol == te->index + 1) {
|
||||
@@ -479,7 +479,7 @@ static eOLDrawState tree_element_active_material(bContext *C,
|
||||
else {
|
||||
if (set != OL_SETSEL_NONE) {
|
||||
ob->actcol = te->index + 1;
|
||||
ob->matbits[te->index] = 0; // make obdata material active too
|
||||
ob->matbits[te->index] = 0; /* Make obdata material active too. */
|
||||
}
|
||||
else {
|
||||
if (ob->actcol == te->index + 1) {
|
||||
@@ -762,14 +762,14 @@ static void tree_element_active_ebone__sel(bContext *C, bArmature *arm, EditBone
|
||||
if (sel) {
|
||||
ebone->flag |= BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL;
|
||||
arm->act_edbone = ebone;
|
||||
// flush to parent?
|
||||
/* Flush to parent? */
|
||||
if (ebone->parent && (ebone->flag & BONE_CONNECTED)) {
|
||||
ebone->parent->flag |= BONE_TIPSEL;
|
||||
}
|
||||
}
|
||||
else {
|
||||
ebone->flag &= ~(BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL);
|
||||
// flush to parent?
|
||||
/* Flush to parent? */
|
||||
if (ebone->parent && (ebone->flag & BONE_CONNECTED)) {
|
||||
ebone->parent->flag &= ~BONE_TIPSEL;
|
||||
}
|
||||
@@ -950,7 +950,7 @@ static eOLDrawState tree_element_active_sequence_dup(Scene *scene,
|
||||
return OL_DRAWSEL_NONE;
|
||||
}
|
||||
|
||||
// XXX select_single_seq(seq, 1);
|
||||
/* XXX select_single_seq(seq, 1); */
|
||||
p = ed->seqbasep->first;
|
||||
while (p) {
|
||||
if ((!p->strip) || (!p->strip->stripdata) || (p->strip->stripdata->name[0] == '\0')) {
|
||||
@@ -958,8 +958,8 @@ static eOLDrawState tree_element_active_sequence_dup(Scene *scene,
|
||||
continue;
|
||||
}
|
||||
|
||||
// if (STREQ(p->strip->stripdata->name, seq->strip->stripdata->name))
|
||||
// XXX select_single_seq(p, 0);
|
||||
/* XXX: if (STREQ(p->strip->stripdata->name, seq->strip->stripdata->name)) select_single_seq(p,
|
||||
* 0); */
|
||||
p = p->next;
|
||||
}
|
||||
return OL_DRAWSEL_NONE;
|
||||
@@ -1160,7 +1160,7 @@ static void do_outliner_item_activate_tree_element(bContext *C,
|
||||
recursive && tselem->type == 0);
|
||||
}
|
||||
|
||||
if (tselem->type == 0) { // the lib blocks
|
||||
if (tselem->type == 0) { /* The lib blocks. */
|
||||
if (do_activate_data == false) {
|
||||
/* Only select in outliner. */
|
||||
}
|
||||
@@ -1209,7 +1209,7 @@ static void do_outliner_item_activate_tree_element(bContext *C,
|
||||
DEG_id_tag_update(&tvc->scene->id, ID_RECALC_SELECT);
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, tvc->scene);
|
||||
}
|
||||
else { // rest of types
|
||||
else { /* Rest of types. */
|
||||
tree_element_active(C, tvc, soops, te, OL_SETSEL_NORMAL, false);
|
||||
}
|
||||
}
|
||||
@@ -1372,7 +1372,7 @@ static int outliner_item_do_activate_from_cursor(bContext *C,
|
||||
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
|
||||
}
|
||||
else {
|
||||
/* The row may also contain children, if one is hovered we want this instead of current te */
|
||||
/* The row may also contain children, if one is hovered we want this instead of current te. */
|
||||
bool merged_elements = false;
|
||||
TreeElement *activate_te = outliner_find_item_at_x_in_row(
|
||||
soops, te, view_mval[0], &merged_elements);
|
||||
|
||||
@@ -862,12 +862,12 @@ void outliner_do_object_operation_ex(bContext *C,
|
||||
bool select_handled = false;
|
||||
if (tselem->flag & TSE_SELECTED) {
|
||||
if (tselem->type == 0 && te->idcode == ID_OB) {
|
||||
// when objects selected in other scenes... dunno if that should be allowed
|
||||
/* When objects selected in other scenes... dunno if that should be allowed. */
|
||||
Scene *scene_owner = (Scene *)outliner_search_back(te, ID_SCE);
|
||||
if (scene_owner && scene_act != scene_owner) {
|
||||
WM_window_set_active_scene(CTX_data_main(C), C, CTX_wm_window(C), scene_owner);
|
||||
}
|
||||
/* important to use 'scene_owner' not scene_act else deleting objects can crash.
|
||||
/* Important to use 'scene_owner' not scene_act else deleting objects can crash.
|
||||
* only use 'scene_act' when 'scene_owner' is NULL, which can happen when the
|
||||
* outliner isn't showing scenes: Visible Layer draw mode for eg. */
|
||||
operation_cb(
|
||||
@@ -1299,7 +1299,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
|
||||
event = RNA_enum_get(op->ptr, "type");
|
||||
|
||||
if (event == OL_OP_SELECT) {
|
||||
Scene *sce = scene; // to be able to delete, scenes are set...
|
||||
Scene *sce = scene; /* To be able to delete, scenes are set... */
|
||||
outliner_do_object_operation(C, op->reports, scene, soops, &soops->tree, object_select_cb);
|
||||
if (scene != sce) {
|
||||
WM_window_set_active_scene(bmain, C, win, sce);
|
||||
@@ -1309,7 +1309,7 @@ static int outliner_object_operation_exec(bContext *C, wmOperator *op)
|
||||
selection_changed = true;
|
||||
}
|
||||
else if (event == OL_OP_SELECT_HIERARCHY) {
|
||||
Scene *sce = scene; // to be able to delete, scenes are set...
|
||||
Scene *sce = scene; /* To be able to delete, scenes are set... */
|
||||
outliner_do_object_operation_ex(
|
||||
C, op->reports, scene, soops, &soops->tree, object_select_hierarchy_cb, NULL, false);
|
||||
if (scene != sce) {
|
||||
@@ -1521,7 +1521,7 @@ typedef enum eOutlinerIdOpTypes {
|
||||
OUTLINER_IDOP_SELECT_LINKED,
|
||||
} eOutlinerIdOpTypes;
|
||||
|
||||
// TODO: implement support for changing the ID-block used
|
||||
/* TODO: implement support for changing the ID-block used. */
|
||||
static const EnumPropertyItem prop_id_op_types[] = {
|
||||
{OUTLINER_IDOP_UNLINK, "UNLINK", 0, "Unlink", ""},
|
||||
{OUTLINER_IDOP_LOCAL, "LOCAL", 0, "Make Local", ""},
|
||||
@@ -1776,14 +1776,14 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
|
||||
break;
|
||||
|
||||
default:
|
||||
// invalid - unhandled
|
||||
/* Invalid - unhandled. */
|
||||
break;
|
||||
}
|
||||
|
||||
/* wrong notifier still... */
|
||||
WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL);
|
||||
|
||||
// XXX: this is just so that outliner is always up to date
|
||||
/* XXX: this is just so that outliner is always up to date. */
|
||||
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_OUTLINER, NULL);
|
||||
|
||||
return OPERATOR_FINISHED;
|
||||
@@ -1959,7 +1959,7 @@ static void actionset_id_cb(TreeElement *UNUSED(te),
|
||||
/* "animation" entries case again */
|
||||
BKE_animdata_set_action(NULL, tsep->id, act);
|
||||
}
|
||||
// TODO: other cases not supported yet
|
||||
/* TODO: other cases not supported yet. */
|
||||
}
|
||||
|
||||
static int outliner_action_set_exec(bContext *C, wmOperator *op)
|
||||
@@ -2031,7 +2031,7 @@ void OUTLINER_OT_action_set(wmOperatorType *ot)
|
||||
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
|
||||
|
||||
/* props */
|
||||
// TODO: this would be nicer as an ID-pointer...
|
||||
/* TODO: this would be nicer as an ID-pointer... */
|
||||
prop = RNA_def_enum(ot->srna, "action", DummyRNA_NULL_items, 0, "Action", "");
|
||||
RNA_def_enum_funcs(prop, RNA_action_itemf);
|
||||
RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
|
||||
@@ -2055,8 +2055,8 @@ typedef enum eOutliner_AnimDataOps {
|
||||
OUTLINER_ANIMOP_REFRESH_DRV,
|
||||
OUTLINER_ANIMOP_CLEAR_DRV
|
||||
|
||||
// OUTLINER_ANIMOP_COPY_DRIVERS,
|
||||
// OUTLINER_ANIMOP_PASTE_DRIVERS
|
||||
/* OUTLINER_ANIMOP_COPY_DRIVERS, */
|
||||
/* OUTLINER_ANIMOP_PASTE_DRIVERS */
|
||||
} eOutliner_AnimDataOps;
|
||||
|
||||
static const EnumPropertyItem prop_animdata_op_types[] = {
|
||||
@@ -2068,8 +2068,8 @@ static const EnumPropertyItem prop_animdata_op_types[] = {
|
||||
{OUTLINER_ANIMOP_SET_ACT, "SET_ACT", 0, "Set Action", ""},
|
||||
{OUTLINER_ANIMOP_CLEAR_ACT, "CLEAR_ACT", 0, "Unlink Action", ""},
|
||||
{OUTLINER_ANIMOP_REFRESH_DRV, "REFRESH_DRIVERS", 0, "Refresh Drivers", ""},
|
||||
//{OUTLINER_ANIMOP_COPY_DRIVERS, "COPY_DRIVERS", 0, "Copy Drivers", ""},
|
||||
//{OUTLINER_ANIMOP_PASTE_DRIVERS, "PASTE_DRIVERS", 0, "Paste Drivers", ""},
|
||||
/* {OUTLINER_ANIMOP_COPY_DRIVERS, "COPY_DRIVERS", 0, "Copy Drivers", ""}, */
|
||||
/* {OUTLINER_ANIMOP_PASTE_DRIVERS, "PASTE_DRIVERS", 0, "Paste Drivers", ""}, */
|
||||
{OUTLINER_ANIMOP_CLEAR_DRV, "CLEAR_DRIVERS", 0, "Clear Drivers", ""},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
@@ -2125,7 +2125,7 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
|
||||
soops, datalevel, event, &soops->tree, refreshdrivers_animdata_cb, NULL);
|
||||
|
||||
WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN, NULL);
|
||||
// ED_undo_push(C, "Refresh Drivers"); /* no undo needed - shouldn't have any impact? */
|
||||
/* ED_undo_push(C, "Refresh Drivers"); No undo needed - shouldn't have any impact? */
|
||||
break;
|
||||
|
||||
case OUTLINER_ANIMOP_CLEAR_DRV:
|
||||
@@ -2136,7 +2136,7 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
|
||||
ED_undo_push(C, "Clear Drivers");
|
||||
break;
|
||||
|
||||
default: // invalid
|
||||
default: /* Invalid. */
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2267,7 +2267,7 @@ void OUTLINER_OT_modifier_operation(wmOperatorType *ot)
|
||||
/** \name Data Menu Operator
|
||||
* \{ */
|
||||
|
||||
// XXX: select linked is for RNA structs only
|
||||
/* XXX: select linked is for RNA structs only. */
|
||||
static const EnumPropertyItem prop_data_op_types[] = {
|
||||
{OL_DOP_SELECT, "SELECT", 0, "Select", ""},
|
||||
{OL_DOP_DESELECT, "DESELECT", 0, "Deselect", ""},
|
||||
@@ -2386,7 +2386,7 @@ static int outliner_operator_menu(bContext *C, const char *opname)
|
||||
static int do_outliner_operation_event(
|
||||
bContext *C, ARegion *region, SpaceOutliner *soops, TreeElement *te, const float mval[2])
|
||||
{
|
||||
ReportList *reports = CTX_wm_reports(C); // XXX...
|
||||
ReportList *reports = CTX_wm_reports(C); /* XXX... */
|
||||
|
||||
if (mval[1] > te->ys && mval[1] < te->ys + UI_UNIT_Y) {
|
||||
int scenelevel = 0, objectlevel = 0, idlevel = 0, datalevel = 0;
|
||||
|
||||
@@ -340,7 +340,7 @@ static void outliner_add_scene_contents(SpaceOutliner *soops,
|
||||
}
|
||||
}
|
||||
|
||||
// can be inlined if necessary
|
||||
/* Can be inlined if necessary. */
|
||||
static void outliner_add_object_contents(SpaceOutliner *soops,
|
||||
TreeElement *te,
|
||||
TreeStoreElem *tselem,
|
||||
@@ -351,7 +351,7 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
|
||||
}
|
||||
|
||||
outliner_add_element(
|
||||
soops, &te->subtree, ob->poselib, te, 0, 0); // XXX FIXME.. add a special type for this
|
||||
soops, &te->subtree, ob->poselib, te, 0, 0); /* XXX FIXME.. add a special type for this. */
|
||||
|
||||
if (ob->proxy && !ID_IS_LINKED(ob)) {
|
||||
outliner_add_element(soops, &te->subtree, ob->proxy, te, TSE_PROXY, 0);
|
||||
@@ -378,12 +378,12 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
|
||||
pchan->temp = (void *)ten;
|
||||
|
||||
if (pchan->constraints.first) {
|
||||
// Object *target;
|
||||
/* Object *target; */
|
||||
bConstraint *con;
|
||||
TreeElement *ten1;
|
||||
TreeElement *tenla1 = outliner_add_element(
|
||||
soops, &ten->subtree, ob, ten, TSE_CONSTRAINT_BASE, 0);
|
||||
// char *str;
|
||||
/* char *str; */
|
||||
|
||||
tenla1->name = IFACE_("Constraints");
|
||||
for (con = pchan->constraints.first; con; con = con->next, const_index++) {
|
||||
@@ -447,11 +447,11 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
|
||||
}
|
||||
|
||||
if (ob->constraints.first) {
|
||||
// Object *target;
|
||||
/* Object *target; */
|
||||
bConstraint *con;
|
||||
TreeElement *ten;
|
||||
TreeElement *tenla = outliner_add_element(soops, &te->subtree, ob, te, TSE_CONSTRAINT_BASE, 0);
|
||||
// char *str;
|
||||
/* char *str; */
|
||||
int a;
|
||||
|
||||
tenla->name = IFACE_("Constraints");
|
||||
@@ -535,7 +535,7 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
|
||||
}
|
||||
}
|
||||
|
||||
// can be inlined if necessary
|
||||
/* Can be inlined if necessary. */
|
||||
static void outliner_add_id_contents(SpaceOutliner *soops,
|
||||
TreeElement *te,
|
||||
TreeStoreElem *tselem,
|
||||
@@ -677,8 +677,8 @@ static void outliner_add_id_contents(SpaceOutliner *soops,
|
||||
break;
|
||||
}
|
||||
case ID_AC: {
|
||||
// XXX do we want to be exposing the F-Curves here?
|
||||
// bAction *act = (bAction *)id;
|
||||
/* XXX do we want to be exposing the F-Curves here? */
|
||||
/* bAction *act = (bAction *)id; */
|
||||
break;
|
||||
}
|
||||
case ID_AR: {
|
||||
@@ -752,7 +752,7 @@ static void outliner_add_id_contents(SpaceOutliner *soops,
|
||||
outliner_add_element(soops, &te->subtree, gpd, te, TSE_ANIM_DATA, 0);
|
||||
}
|
||||
|
||||
// TODO: base element for layers?
|
||||
/* TODO: base element for layers? */
|
||||
for (gpl = gpd->layers.last; gpl; gpl = gpl->prev) {
|
||||
outliner_add_element(soops, &te->subtree, gpl, te, TSE_GP_LAYER, a);
|
||||
a++;
|
||||
@@ -851,7 +851,7 @@ static TreeElement *outliner_add_element(
|
||||
}
|
||||
|
||||
te->parent = parent;
|
||||
te->index = index; // for data arrays
|
||||
te->index = index; /* For data arrays. */
|
||||
if (ELEM(type, TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP)) {
|
||||
/* pass */
|
||||
}
|
||||
@@ -876,7 +876,7 @@ static TreeElement *outliner_add_element(
|
||||
te->name = ((Library *)id)->filepath;
|
||||
}
|
||||
else {
|
||||
te->name = id->name + 2; // default, can be overridden by Library or non-ID data
|
||||
te->name = id->name + 2; /* Default, can be overridden by Library or non-ID data. */
|
||||
}
|
||||
te->idcode = GS(id->name);
|
||||
}
|
||||
@@ -917,7 +917,7 @@ static TreeElement *outliner_add_element(
|
||||
/* loop over all targets used here */
|
||||
DRIVER_TARGETS_USED_LOOPER_BEGIN (dvar) {
|
||||
if (lastadded != dtar->id) {
|
||||
// XXX this lastadded check is rather lame, and also fails quite badly...
|
||||
/* XXX this lastadded check is rather lame, and also fails quite badly... */
|
||||
outliner_add_element(soops, &ted->subtree, dtar->id, ted, TSE_LINKED_OB, 0);
|
||||
lastadded = dtar->id;
|
||||
}
|
||||
@@ -1529,7 +1529,7 @@ static void outliner_make_object_parent_hierarchy(ListBase *lb)
|
||||
TreeStoreElem *tselem;
|
||||
|
||||
/* build hierarchy */
|
||||
// XXX also, set extents here...
|
||||
/* XXX also, set extents here... */
|
||||
te = lb->first;
|
||||
while (te) {
|
||||
ten = te->next;
|
||||
@@ -1793,10 +1793,10 @@ static void outliner_sort(ListBase *lb)
|
||||
tp->idcode = te->idcode;
|
||||
|
||||
if (tselem->type && tselem->type != TSE_DEFGROUP) {
|
||||
tp->idcode = 0; // don't sort this
|
||||
tp->idcode = 0; /* Don't sort this. */
|
||||
}
|
||||
if (tselem->type == TSE_ID_BASE) {
|
||||
tp->idcode = 1; // do sort this
|
||||
tp->idcode = 1; /* Do sort this. */
|
||||
}
|
||||
|
||||
tp->id = tselem->id;
|
||||
@@ -2307,8 +2307,8 @@ static void outliner_filter_tree(SpaceOutliner *soops, ViewLayer *view_layer)
|
||||
/* ======================================================= */
|
||||
/* Main Tree Building API */
|
||||
|
||||
/* Main entry point for building the tree data-structure that the outliner represents */
|
||||
// TODO: split each mode into its own function?
|
||||
/* Main entry point for building the tree data-structure that the outliner represents. */
|
||||
/* TODO: split each mode into its own function? */
|
||||
void outliner_build_tree(
|
||||
Main *mainvar, Scene *scene, ViewLayer *view_layer, SpaceOutliner *soops, ARegion *region)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user