Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/space_outliner/outliner_select.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_select.c336
1 files changed, 168 insertions, 168 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 00b3979b074..18769476118 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -73,21 +73,21 @@ static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *se
{
TreeElement *te;
TreeStoreElem *tselem;
- int change= 0;
+ int change = 0;
- for (te= lb->first; te && *index >= 0; te=te->next, (*index)--) {
- tselem= TREESTORE(te);
+ for (te = lb->first; te && *index >= 0; te = te->next, (*index)--) {
+ tselem = TREESTORE(te);
/* if we've encountered the right item, set its 'Outliner' selection status */
if (*index == 0) {
/* this should be the last one, so no need to do anything with index */
- if ((te->flag & TE_ICONROW)==0) {
+ if ((te->flag & TE_ICONROW) == 0) {
/* -1 value means toggle testing for now... */
if (*selecting == -1) {
if (tselem->flag & TSE_SELECTED)
- *selecting= 0;
+ *selecting = 0;
else
- *selecting= 1;
+ *selecting = 1;
}
/* set selection */
@@ -103,9 +103,9 @@ static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *se
/* Only try selecting sub-elements if we haven't hit the right element yet
*
* Hack warning:
- * Index must be reduced before supplying it to the sub-tree to try to do
- * selection, however, we need to increment it again for the next loop to
- * function correctly
+ * Index must be reduced before supplying it to the sub-tree to try to do
+ * selection, however, we need to increment it again for the next loop to
+ * function correctly
*/
(*index)--;
change |= outliner_select(soops, &te->subtree, index, selecting);
@@ -124,45 +124,45 @@ static int tree_element_active_renderlayer(bContext *C, TreeElement *te, TreeSto
Scene *sce;
/* paranoia check */
- if (te->idcode!=ID_SCE)
+ if (te->idcode != ID_SCE)
return 0;
- sce= (Scene *)tselem->id;
+ sce = (Scene *)tselem->id;
if (set) {
- sce->r.actlay= tselem->nr;
- WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, sce);
+ sce->r.actlay = tselem->nr;
+ WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, sce);
}
else {
- return sce->r.actlay==tselem->nr;
+ return sce->r.actlay == tselem->nr;
}
return 0;
}
static int tree_element_set_active_object(bContext *C, Scene *scene, SpaceOops *soops, TreeElement *te, int set)
{
- TreeStoreElem *tselem= TREESTORE(te);
+ TreeStoreElem *tselem = TREESTORE(te);
Scene *sce;
Base *base;
- Object *ob= NULL;
+ Object *ob = NULL;
/* if id is not object, we search back */
- if (te->idcode==ID_OB) ob= (Object *)tselem->id;
+ if (te->idcode == ID_OB) ob = (Object *)tselem->id;
else {
- ob= (Object *)outliner_search_back(soops, te, ID_OB);
- if (ob==OBACT) return 0;
+ ob = (Object *)outliner_search_back(soops, te, ID_OB);
+ if (ob == OBACT) return 0;
}
- if (ob==NULL) return 0;
+ if (ob == NULL) return 0;
- sce= (Scene *)outliner_search_back(soops, te, ID_SCE);
+ sce = (Scene *)outliner_search_back(soops, te, ID_SCE);
if (sce && scene != sce) {
ED_screen_set_scene(C, CTX_wm_screen(C), sce);
}
/* find associated base in current scene */
- base= object_in_scene(ob, scene);
+ base = BKE_scene_base_find(scene, ob);
if (base) {
- if (set==2) {
+ if (set == 2) {
/* swap select */
if (base->flag & SELECT)
ED_base_object_select(base, BA_DESELECT);
@@ -171,17 +171,17 @@ static int tree_element_set_active_object(bContext *C, Scene *scene, SpaceOops
}
else {
/* deleselect all */
- scene_deselect_all(scene);
+ BKE_scene_base_deselect_all(scene);
ED_base_object_select(base, BA_SELECT);
}
if (C) {
ED_base_object_activate(C, base); /* adds notifier */
- WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
}
}
- if (ob!=scene->obedit)
- ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR|EM_DO_UNDO);
+ if (ob != scene->obedit)
+ ED_object_exit_editmode(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);
return 1;
}
@@ -192,35 +192,35 @@ static int tree_element_active_material(bContext *C, Scene *scene, SpaceOops *so
Object *ob;
/* we search for the object parent */
- ob= (Object *)outliner_search_back(soops, te, ID_OB);
+ ob = (Object *)outliner_search_back(soops, te, ID_OB);
// note: ob->matbits can be NULL when a local object points to a library mesh.
- if (ob==NULL || ob!=OBACT || ob->matbits==NULL) return 0; // just paranoia
+ if (ob == NULL || ob != OBACT || ob->matbits == NULL) return 0; // just paranoia
/* searching in ob mat array? */
- tes= te->parent;
- if (tes->idcode==ID_OB) {
+ tes = te->parent;
+ if (tes->idcode == ID_OB) {
if (set) {
- ob->actcol= te->index+1;
- ob->matbits[te->index]= 1; // make ob material active too
+ ob->actcol = te->index + 1;
+ ob->matbits[te->index] = 1; // make ob material active too
}
else {
- if (ob->actcol == te->index+1)
+ if (ob->actcol == te->index + 1)
if (ob->matbits[te->index]) return 1;
}
}
/* or we search for obdata material */
else {
if (set) {
- ob->actcol= te->index+1;
- ob->matbits[te->index]= 0; // make obdata material active too
+ ob->actcol = te->index + 1;
+ ob->matbits[te->index] = 0; // make obdata material active too
}
else {
- if (ob->actcol == te->index+1)
- if (ob->matbits[te->index]==0) return 1;
+ if (ob->actcol == te->index + 1)
+ if (ob->matbits[te->index] == 0) return 1;
}
}
if (set) {
- WM_event_add_notifier(C, NC_MATERIAL|ND_SHADING, NULL);
+ WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING, NULL);
}
return 0;
}
@@ -229,10 +229,10 @@ static int tree_element_active_texture(bContext *C, Scene *scene, SpaceOops *soo
{
TreeElement *tep;
TreeStoreElem /* *tselem,*/ *tselemp;
- Object *ob=OBACT;
- SpaceButs *sbuts=NULL;
+ Object *ob = OBACT;
+ SpaceButs *sbuts = NULL;
- if (ob==NULL) return 0; // no active object
+ if (ob == NULL) return 0; // no active object
/*tselem= TREESTORE(te);*/ /*UNUSED*/
@@ -240,11 +240,11 @@ static int tree_element_active_texture(bContext *C, Scene *scene, SpaceOops *soo
/* XXX removed finding sbuts */
/* where is texture linked to? */
- tep= te->parent;
- tselemp= TREESTORE(tep);
+ tep = te->parent;
+ tselemp = TREESTORE(tep);
- if (tep->idcode==ID_WO) {
- World *wrld= (World *)tselemp->id;
+ if (tep->idcode == ID_WO) {
+ World *wrld = (World *)tselemp->id;
if (set) {
if (sbuts) {
@@ -252,43 +252,43 @@ static int tree_element_active_texture(bContext *C, Scene *scene, SpaceOops *soo
// XXX sbuts->texfrom= 1;
}
// XXX extern_set_butspace(F6KEY, 0); // force shading buttons texture
- wrld->texact= te->index;
+ wrld->texact = te->index;
}
else if (tselemp->id == (ID *)(scene->world)) {
- if (wrld->texact==te->index) return 1;
+ if (wrld->texact == te->index) return 1;
}
}
- else if (tep->idcode==ID_LA) {
- Lamp *la= (Lamp *)tselemp->id;
+ else if (tep->idcode == ID_LA) {
+ Lamp *la = (Lamp *)tselemp->id;
if (set) {
if (sbuts) {
// XXX sbuts->tabo= TAB_SHADING_TEX; // hack from header_buttonswin.c
// XXX sbuts->texfrom= 2;
}
// XXX extern_set_butspace(F6KEY, 0); // force shading buttons texture
- la->texact= te->index;
+ la->texact = te->index;
}
else {
if (tselemp->id == ob->data) {
- if (la->texact==te->index) return 1;
+ if (la->texact == te->index) return 1;
}
}
}
- else if (tep->idcode==ID_MA) {
- Material *ma= (Material *)tselemp->id;
+ else if (tep->idcode == ID_MA) {
+ Material *ma = (Material *)tselemp->id;
if (set) {
if (sbuts) {
//sbuts->tabo= TAB_SHADING_TEX; // hack from header_buttonswin.c
// XXX sbuts->texfrom= 0;
}
// XXX extern_set_butspace(F6KEY, 0); // force shading buttons texture
- ma->texact= (char)te->index;
+ ma->texact = (char)te->index;
/* also set active material */
- ob->actcol= tep->index+1;
+ ob->actcol = tep->index + 1;
}
- else if (tep->flag & TE_ACTIVE) { // this is active material
- if (ma->texact==te->index) return 1;
+ else if (tep->flag & TE_ACTIVE) { // this is active material
+ if (ma->texact == te->index) return 1;
}
}
@@ -304,8 +304,8 @@ static int tree_element_active_lamp(bContext *UNUSED(C), Scene *scene, SpaceOops
Object *ob;
/* we search for the object parent */
- ob= (Object *)outliner_search_back(soops, te, ID_OB);
- if (ob==NULL || ob!=OBACT) return 0; // just paranoia
+ ob = (Object *)outliner_search_back(soops, te, ID_OB);
+ if (ob == NULL || ob != OBACT) return 0; // just paranoia
if (set) {
// XXX extern_set_butspace(F5KEY, 0);
@@ -317,7 +317,7 @@ static int tree_element_active_lamp(bContext *UNUSED(C), Scene *scene, SpaceOops
static int tree_element_active_camera(bContext *UNUSED(C), Scene *scene, SpaceOops *soops, TreeElement *te, int set)
{
- Object *ob= (Object *)outliner_search_back(soops, te, ID_OB);
+ Object *ob = (Object *)outliner_search_back(soops, te, ID_OB);
if (set)
return 0;
@@ -328,22 +328,22 @@ static int tree_element_active_camera(bContext *UNUSED(C), Scene *scene, SpaceOo
static int tree_element_active_world(bContext *C, Scene *scene, SpaceOops *soops, TreeElement *te, int set)
{
TreeElement *tep;
- TreeStoreElem *tselem=NULL;
- Scene *sce=NULL;
+ TreeStoreElem *tselem = NULL;
+ Scene *sce = NULL;
- tep= te->parent;
+ tep = te->parent;
if (tep) {
- tselem= TREESTORE(tep);
- sce= (Scene *)tselem->id;
+ tselem = TREESTORE(tep);
+ sce = (Scene *)tselem->id;
}
- if (set) { // make new scene active
+ if (set) { // make new scene active
if (sce && scene != sce) {
ED_screen_set_scene(C, CTX_wm_screen(C), sce);
}
}
- if (tep==NULL || tselem->id == (ID *)scene) {
+ if (tep == NULL || tselem->id == (ID *)scene) {
if (set) {
// XXX extern_set_butspace(F8KEY, 0);
}
@@ -359,34 +359,34 @@ static int tree_element_active_defgroup(bContext *C, Scene *scene, TreeElement *
Object *ob;
/* id in tselem is object */
- ob= (Object *)tselem->id;
+ ob = (Object *)tselem->id;
if (set) {
- BLI_assert(te->index+1 >= 0);
- ob->actdef= te->index+1;
+ BLI_assert(te->index + 1 >= 0);
+ ob->actdef = te->index + 1;
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
- WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
}
else {
- if (ob==OBACT)
- if (ob->actdef== te->index+1) return 1;
+ if (ob == OBACT)
+ if (ob->actdef == te->index + 1) return 1;
}
return 0;
}
static int tree_element_active_posegroup(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, int set)
{
- Object *ob= (Object *)tselem->id;
+ Object *ob = (Object *)tselem->id;
if (set) {
if (ob->pose) {
- ob->pose->active_group= te->index+1;
- WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
+ ob->pose->active_group = te->index + 1;
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
}
}
else {
- if (ob==OBACT && ob->pose) {
- if (ob->pose->active_group== te->index+1) return 1;
+ if (ob == OBACT && ob->pose) {
+ if (ob->pose->active_group == te->index + 1) return 1;
}
}
return 0;
@@ -394,30 +394,30 @@ static int tree_element_active_posegroup(bContext *C, Scene *scene, TreeElement
static int tree_element_active_posechannel(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, int set)
{
- Object *ob= (Object *)tselem->id;
- bArmature *arm= ob->data;
- bPoseChannel *pchan= te->directdata;
+ Object *ob = (Object *)tselem->id;
+ bArmature *arm = ob->data;
+ bPoseChannel *pchan = te->directdata;
if (set) {
if (!(pchan->bone->flag & BONE_HIDDEN_P)) {
- if (set==2) ED_pose_deselectall(ob, 2); // 2 = clear active tag
- else ED_pose_deselectall(ob, 0); // 0 = deselect
+ if (set == 2) ED_pose_deselectall(ob, 2); // 2 = clear active tag
+ else ED_pose_deselectall(ob, 0); // 0 = deselect
- if (set==2 && (pchan->bone->flag & BONE_SELECTED)) {
+ if (set == 2 && (pchan->bone->flag & BONE_SELECTED)) {
pchan->bone->flag &= ~BONE_SELECTED;
}
else {
pchan->bone->flag |= BONE_SELECTED;
- arm->act_bone= pchan->bone;
+ arm->act_bone = pchan->bone;
}
- WM_event_add_notifier(C, NC_OBJECT|ND_BONE_ACTIVE, ob);
+ WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, ob);
}
}
else {
- if (ob==OBACT && ob->pose) {
+ if (ob == OBACT && ob->pose) {
if (pchan->bone->flag & BONE_SELECTED) return 1;
}
}
@@ -426,29 +426,29 @@ static int tree_element_active_posechannel(bContext *C, Scene *scene, TreeElemen
static int tree_element_active_bone(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *tselem, int set)
{
- bArmature *arm= (bArmature *)tselem->id;
- Bone *bone= te->directdata;
+ bArmature *arm = (bArmature *)tselem->id;
+ Bone *bone = te->directdata;
if (set) {
if (!(bone->flag & BONE_HIDDEN_P)) {
- if (set==2) ED_pose_deselectall(OBACT, 2); // 2 is clear active tag
+ if (set == 2) ED_pose_deselectall(OBACT, 2); // 2 is clear active tag
else ED_pose_deselectall(OBACT, 0);
- if (set==2 && (bone->flag & BONE_SELECTED)) {
+ if (set == 2 && (bone->flag & BONE_SELECTED)) {
bone->flag &= ~BONE_SELECTED;
}
else {
bone->flag |= BONE_SELECTED;
- arm->act_bone= bone;
+ arm->act_bone = bone;
}
- WM_event_add_notifier(C, NC_OBJECT|ND_BONE_ACTIVE, OBACT);
+ WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, OBACT);
}
}
else {
- Object *ob= OBACT;
+ Object *ob = OBACT;
- if (ob && ob->data==arm) {
+ if (ob && ob->data == arm) {
if (bone->flag & BONE_SELECTED) return 1;
}
}
@@ -460,32 +460,32 @@ static int tree_element_active_bone(bContext *C, Scene *scene, TreeElement *te,
static void tree_element_active_ebone__sel(bContext *C, Scene *scene, bArmature *arm, EditBone *ebone, short sel)
{
if (sel) {
- ebone->flag |= BONE_SELECTED|BONE_ROOTSEL|BONE_TIPSEL;
- arm->act_edbone= ebone;
+ ebone->flag |= BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL;
+ arm->act_edbone = ebone;
// flush to parent?
if (ebone->parent && (ebone->flag & BONE_CONNECTED)) ebone->parent->flag |= BONE_TIPSEL;
}
else {
- ebone->flag &= ~(BONE_SELECTED|BONE_ROOTSEL|BONE_TIPSEL);
+ ebone->flag &= ~(BONE_SELECTED | BONE_ROOTSEL | BONE_TIPSEL);
// flush to parent?
if (ebone->parent && (ebone->flag & BONE_CONNECTED)) ebone->parent->flag &= ~BONE_TIPSEL;
}
- WM_event_add_notifier(C, NC_OBJECT|ND_BONE_ACTIVE, scene->obedit);
+ WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, scene->obedit);
}
static int tree_element_active_ebone(bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), int set)
{
- bArmature *arm= scene->obedit->data;
- EditBone *ebone= te->directdata;
+ bArmature *arm = scene->obedit->data;
+ EditBone *ebone = te->directdata;
- if (set==1) {
+ if (set == 1) {
if (!(ebone->flag & BONE_HIDDEN_A)) {
- ED_armature_deselect_all(scene->obedit, 0); // deselect
+ ED_armature_deselect_all(scene->obedit, 0); // deselect
tree_element_active_ebone__sel(C, scene, arm, ebone, TRUE);
return 1;
}
}
- else if (set==2) {
+ else if (set == 2) {
if (!(ebone->flag & BONE_HIDDEN_A)) {
if (!(ebone->flag & BONE_SELECTED)) {
tree_element_active_ebone__sel(C, scene, arm, ebone, TRUE);
@@ -507,9 +507,9 @@ static int tree_element_active_ebone(bContext *C, Scene *scene, TreeElement *te,
static int tree_element_active_modifier(bContext *C, TreeElement *UNUSED(te), TreeStoreElem *tselem, int set)
{
if (set) {
- Object *ob= (Object *)tselem->id;
+ Object *ob = (Object *)tselem->id;
- WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
+ WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
// XXX extern_set_butspace(F9KEY, 0);
}
@@ -520,9 +520,9 @@ static int tree_element_active_modifier(bContext *C, TreeElement *UNUSED(te), Tr
static int tree_element_active_psys(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tselem, int set)
{
if (set) {
- Object *ob= (Object *)tselem->id;
+ Object *ob = (Object *)tselem->id;
- WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
+ WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_EDITED, ob);
// XXX extern_set_butspace(F7KEY, 0);
}
@@ -533,9 +533,9 @@ static int tree_element_active_psys(bContext *C, Scene *UNUSED(scene), TreeEleme
static int tree_element_active_constraint(bContext *C, TreeElement *UNUSED(te), TreeStoreElem *tselem, int set)
{
if (set) {
- Object *ob= (Object *)tselem->id;
+ Object *ob = (Object *)tselem->id;
- WM_event_add_notifier(C, NC_OBJECT|ND_CONSTRAINT, ob);
+ WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
// XXX extern_set_butspace(F7KEY, 0);
}
@@ -550,12 +550,12 @@ static int tree_element_active_text(bContext *UNUSED(C), Scene *UNUSED(scene), S
static int tree_element_active_pose(bContext *C, Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *tselem, int set)
{
- Object *ob= (Object *)tselem->id;
- Base *base= object_in_scene(ob, scene);
+ Object *ob = (Object *)tselem->id;
+ Base *base = BKE_scene_base_find(scene, ob);
if (set) {
if (scene->obedit)
- ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR|EM_DO_UNDO);
+ ED_object_exit_editmode(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);
if (ob->mode & OB_MODE_POSE)
ED_armature_exit_posemode(C, base);
@@ -570,7 +570,7 @@ static int tree_element_active_pose(bContext *C, Scene *scene, TreeElement *UNUS
static int tree_element_active_sequence(TreeElement *te, TreeStoreElem *UNUSED(tselem), int set)
{
- Sequence *seq= (Sequence*) te->directdata;
+ Sequence *seq = (Sequence *) te->directdata;
if (set) {
// XXX select_single_seq(seq, 1);
@@ -585,26 +585,26 @@ static int tree_element_active_sequence(TreeElement *te, TreeStoreElem *UNUSED(t
static int tree_element_active_sequence_dup(Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), int set)
{
Sequence *seq, *p;
- Editing *ed= seq_give_editing(scene, FALSE);
+ Editing *ed = BKE_sequencer_editing_get(scene, FALSE);
- seq= (Sequence*)te->directdata;
- if (set==0) {
+ seq = (Sequence *)te->directdata;
+ if (set == 0) {
if (seq->flag & SELECT)
return(1);
return(0);
}
// XXX select_single_seq(seq, 1);
- p= ed->seqbasep->first;
+ p = ed->seqbasep->first;
while (p) {
if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) {
- p= p->next;
+ p = p->next;
continue;
}
// if (!strcmp(p->strip->stripdata->name, seq->strip->stripdata->name))
// XXX select_single_seq(p, 0);
- p= p->next;
+ p = p->next;
}
return(0);
}
@@ -613,7 +613,7 @@ static int tree_element_active_keymap_item(bContext *UNUSED(C), TreeElement *te,
{
wmKeyMapItem *kmi = te->directdata;
- if (set==0) {
+ if (set == 0) {
if (kmi->flag & KMI_INACTIVE) return 0;
return 1;
}
@@ -663,7 +663,7 @@ int tree_element_type_active(bContext *C, Scene *scene, SpaceOops *soops, TreeEl
return tree_element_active_modifier(C, te, tselem, set);
case TSE_LINKED_OB:
if (set) tree_element_set_active_object(C, scene, soops, te, set);
- else if (tselem->id==(ID *)OBACT) return 1;
+ else if (tselem->id == (ID *)OBACT) return 1;
break;
case TSE_LINKED_PSYS:
return tree_element_active_psys(C, scene, te, tselem, set);
@@ -693,14 +693,14 @@ int tree_element_type_active(bContext *C, Scene *scene, SpaceOops *soops, TreeEl
static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, SpaceOops *soops, TreeElement *te, int extend, const float mval[2])
{
- if (mval[1]>te->ys && mval[1]<te->ys+UI_UNIT_Y) {
- TreeStoreElem *tselem= TREESTORE(te);
- int openclose= 0;
+ if (mval[1] > te->ys && mval[1] < te->ys + UI_UNIT_Y) {
+ TreeStoreElem *tselem = TREESTORE(te);
+ int openclose = 0;
/* open close icon */
- if ((te->flag & TE_ICONROW)==0) { // hidden icon, no open/close
- if ( mval[0]>te->xs && mval[0]<te->xs+UI_UNIT_X)
- openclose= 1;
+ if ((te->flag & TE_ICONROW) == 0) { // hidden icon, no open/close
+ if (mval[0] > te->xs && mval[0] < te->xs + UI_UNIT_X)
+ openclose = 1;
}
if (openclose) {
@@ -718,62 +718,62 @@ static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, Spa
return 1;
}
/* name and first icon */
- else if (mval[0]>te->xs+UI_UNIT_X && mval[0]<te->xend) {
+ else if (mval[0] > te->xs + UI_UNIT_X && mval[0] < te->xend) {
/* always makes active object */
- if (tselem->type!=TSE_SEQUENCE && tselem->type!=TSE_SEQ_STRIP && tselem->type!=TSE_SEQUENCE_DUP)
- tree_element_set_active_object(C, scene, soops, te, 1 + (extend!=0 && tselem->type==0));
+ if (tselem->type != TSE_SEQUENCE && tselem->type != TSE_SEQ_STRIP && tselem->type != TSE_SEQUENCE_DUP)
+ tree_element_set_active_object(C, scene, soops, te, 1 + (extend != 0 && tselem->type == 0));
- if (tselem->type==0) { // the lib blocks
+ if (tselem->type == 0) { // the lib blocks
/* editmode? */
- if (te->idcode==ID_SCE) {
- if (scene!=(Scene *)tselem->id) {
+ if (te->idcode == ID_SCE) {
+ if (scene != (Scene *)tselem->id) {
ED_screen_set_scene(C, CTX_wm_screen(C), (Scene *)tselem->id);
}
}
- else if (te->idcode==ID_GR) {
- Group *gr= (Group *)tselem->id;
+ else if (te->idcode == ID_GR) {
+ Group *gr = (Group *)tselem->id;
GroupObject *gob;
if (extend) {
- int sel= BA_SELECT;
- for (gob= gr->gobject.first; gob; gob= gob->next) {
+ int sel = BA_SELECT;
+ for (gob = gr->gobject.first; gob; gob = gob->next) {
if (gob->ob->flag & SELECT) {
- sel= BA_DESELECT;
+ sel = BA_DESELECT;
break;
}
}
- for (gob= gr->gobject.first; gob; gob= gob->next) {
- ED_base_object_select(object_in_scene(gob->ob, scene), sel);
+ for (gob = gr->gobject.first; gob; gob = gob->next) {
+ ED_base_object_select(BKE_scene_base_find(scene, gob->ob), sel);
}
}
else {
- scene_deselect_all(scene);
+ BKE_scene_base_deselect_all(scene);
- for (gob= gr->gobject.first; gob; gob= gob->next) {
+ for (gob = gr->gobject.first; gob; gob = gob->next) {
if ((gob->ob->flag & SELECT) == 0)
- ED_base_object_select(object_in_scene(gob->ob, scene), BA_SELECT);
+ ED_base_object_select(BKE_scene_base_find(scene, gob->ob), BA_SELECT);
}
}
- WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
}
else if (ELEM5(te->idcode, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) {
WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
}
- else { // rest of types
+ else { // rest of types
tree_element_active(C, scene, soops, te, 1);
}
}
- else tree_element_type_active(C, scene, soops, te, tselem, 1+(extend!=0));
+ else tree_element_type_active(C, scene, soops, te, tselem, 1 + (extend != 0));
return 1;
}
}
- for (te= te->subtree.first; te; te= te->next) {
+ for (te = te->subtree.first; te; te = te->next) {
if (do_outliner_item_activate(C, scene, ar, soops, te, extend, mval)) return 1;
}
return 0;
@@ -782,23 +782,23 @@ static int do_outliner_item_activate(bContext *C, Scene *scene, ARegion *ar, Spa
/* event can enterkey, then it opens/closes */
static int outliner_item_activate(bContext *C, wmOperator *op, wmEvent *event)
{
- Scene *scene= CTX_data_scene(C);
- ARegion *ar= CTX_wm_region(C);
- SpaceOops *soops= CTX_wm_space_outliner(C);
+ Scene *scene = CTX_data_scene(C);
+ ARegion *ar = CTX_wm_region(C);
+ SpaceOops *soops = CTX_wm_space_outliner(C);
TreeElement *te;
float fmval[2];
- int extend= RNA_boolean_get(op->ptr, "extend");
+ int extend = RNA_boolean_get(op->ptr, "extend");
- UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], fmval, fmval+1);
+ UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], fmval, fmval + 1);
- if ( !ELEM3(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF, SO_KEYMAP) &&
- !(soops->flag & SO_HIDE_RESTRICTCOLS) &&
- (fmval[0] > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX))
+ if (!ELEM3(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF, SO_KEYMAP) &&
+ !(soops->flag & SO_HIDE_RESTRICTCOLS) &&
+ (fmval[0] > ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX))
{
return OPERATOR_CANCELLED;
}
- for (te= soops->tree.first; te; te= te->next) {
+ for (te = soops->tree.first; te; te = te->next) {
if (do_outliner_item_activate(C, scene, ar, soops, te, extend, fmval)) break;
}
@@ -806,12 +806,12 @@ static int outliner_item_activate(bContext *C, wmOperator *op, wmEvent *event)
ED_undo_push(C, "Outliner click event");
}
else {
- short selecting= -1;
+ short selecting = -1;
int row;
/* get row number - 100 here is just a dummy value since we don't need the column */
UI_view2d_listview_view_to_cell(&ar->v2d, 1000, UI_UNIT_Y, 0.0f, OL_Y_OFFSET,
- fmval[0], fmval[1], NULL, &row);
+ fmval[0], fmval[1], NULL, &row);
/* select relevant row */
if (outliner_select(soops, &soops->tree, &row, &selecting)) {
@@ -847,7 +847,7 @@ void OUTLINER_OT_item_activate(wmOperatorType *ot)
/* **************** Border Select Tool ****************** */
static void outliner_item_border_select(Scene *scene, SpaceOops *soops, rctf *rectf, TreeElement *te, int gesture_mode)
{
- TreeStoreElem *tselem= TREESTORE(te);
+ TreeStoreElem *tselem = TREESTORE(te);
if (te->ys <= rectf->ymax && te->ys + UI_UNIT_Y >= rectf->ymin) {
if (gesture_mode == GESTURE_MODAL_SELECT) {
@@ -869,13 +869,13 @@ static void outliner_item_border_select(Scene *scene, SpaceOops *soops, rctf *re
static int outliner_border_select_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
- SpaceOops *soops= CTX_wm_space_outliner(C);
- ARegion *ar= CTX_wm_region(C);
+ Scene *scene = CTX_data_scene(C);
+ SpaceOops *soops = CTX_wm_space_outliner(C);
+ ARegion *ar = CTX_wm_region(C);
TreeElement *te;
rcti rect;
rctf rectf;
- int gesture_mode= RNA_int_get(op->ptr, "gesture_mode");
+ int gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
rect.xmin = RNA_int_get(op->ptr, "xmin");
rect.ymin = RNA_int_get(op->ptr, "ymin");
@@ -885,11 +885,11 @@ static int outliner_border_select_exec(bContext *C, wmOperator *op)
rect.ymax = RNA_int_get(op->ptr, "ymax");
UI_view2d_region_to_view(&ar->v2d, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);
- for (te= soops->tree.first; te; te= te->next) {
+ for (te = soops->tree.first; te; te = te->next) {
outliner_item_border_select(scene, soops, &rectf, te, gesture_mode);
}
- WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
ED_region_tag_redraw(ar);
return OPERATOR_FINISHED;
@@ -911,7 +911,7 @@ void OUTLINER_OT_select_border(wmOperatorType *ot)
ot->poll = ED_operator_outliner_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* rna */
WM_operator_properties_gesture_border(ot, FALSE);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:34:37 +0300