griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Suggestion from Lazareus in IRC, deselect objects when they are made

Browse Source 
invisible in the 3D View, so no unintended commands apply to them
This commit is contained in:
Matt Ebb
2006-11-20 05:44:30 +00:00
parent 606a386888
commit 2cde6d2cd5
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/src/outliner.c
View File

@@ -3098,8 +3098,24 @@ static void outliner_draw_restrictcols(SpaceOops *soops)
(short)soops->v2d.cur.ymin);
}
static void restrictbutton_cb(void *poin, void *poin2)
static void restrictbutton_view_cb(void *poin, void *poin2)
{
Base *base;
Object *ob = (Object *)poin;
/* deselect objects that are invisible */
if (ob->restrictflag & OB_RESTRICT_VIEW) {
/* Ouch! There is no backwards pointer from Object to Base,
* so have to do loop to find it. */
for(base= FIRSTBASE; base; base= base->next) {
if(base->object==ob) {
base->flag &= ~SELECT;
base->object->flag= base->flag;
}
}
}
allqueue(REDRAWOOPS, 0);
allqueue(REDRAWVIEW3D, 0);
}
@@ -3126,6 +3142,12 @@ static void restrictbutton_sel_cb(void *poin, void *poin2)
allqueue(REDRAWVIEW3D, 0);
}
static void restrictbutton_rend_cb(void *poin, void *poin2)
{
allqueue(REDRAWOOPS, 0);
allqueue(REDRAWVIEW3D, 0);
}
static void namebutton_cb(void *tep, void *oldnamep)
{
SpaceOops *soops= curarea->spacedata.first;
@@ -3245,7 +3267,7 @@ static void outliner_buttons(uiBlock *block, SpaceOops *soops, ListBase *lb)
uiBlockSetEmboss(block, UI_EMBOSSN);
bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_VIEW, REDRAWALL, ICON_RESTRICT_VIEW_OFF,
(int)soops->v2d.mask.xmax-(OL_TOG_RESTRICT_VIEWX+SCROLLB), te->ys, 17, OL_H-1, &(ob->restrictflag), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
uiButSetFunc(bt, restrictbutton_cb, NULL, NULL);
uiButSetFunc(bt, restrictbutton_view_cb, NULL, NULL);
uiButSetFlag(bt, UI_NO_HILITE);
bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_SELECT, REDRAWALL, ICON_RESTRICT_SELECT_OFF,
@@ -3257,7 +3279,7 @@ static void outliner_buttons(uiBlock *block, SpaceOops *soops, ListBase *lb)
if (! (ELEM4(ob->type, OB_CAMERA, OB_LATTICE, OB_ARMATURE, OB_EMPTY))) {
bt= uiDefIconButBitS(block, ICONTOG, OB_RESTRICT_RENDER, REDRAWALL, ICON_RESTRICT_RENDER_OFF,
(int)soops->v2d.mask.xmax-(OL_TOG_RESTRICT_RENDERX+SCROLLB), te->ys, 17, OL_H-1, &(ob->restrictflag), 0, 0, 0, 0, "Restrict/Allow renderability");
uiButSetFunc(bt, restrictbutton_cb, NULL, NULL);
uiButSetFunc(bt, restrictbutton_rend_cb, NULL, NULL);
uiButSetFlag(bt, UI_NO_HILITE);
}