Page MenuHome
Differential D1481 Diff 4911 source/blender/editors/space_outliner/outliner_edit.c

Changeset View

Standalone View

View Options

source/blender/editors/space_outliner/outliner_edit.c

Context not available.
/* Toggle Visibility ---------------------------------------- */ /* Toggle Visibility ---------------------------------------- */
void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te, void object_restrict_visibility_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem) TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{ {
Base *base = (Base *)te->directdata; Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id; Object *ob = (Object *)tselem->id;
/* add check for edit mode */ /* add check for edit mode */
if (!common_restrict_check(C, ob)) return; if (!common_restrict_check(C, ob)) return;
if (base || (base = BKE_scene_base_find(scene, ob))) { if (base || (base = BKE_scene_base_find(scene, ob))) {
if ((base->object->restrictflag ^= OB_RESTRICT_VIEW)) { base->object->restrictflag |= OB_RESTRICT_VIEW;
ED_base_object_select(base, BA_DESELECT); ED_base_object_select(base, BA_DESELECT);
} }
}
void object_unrestrict_visibility_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
/* add check for edit mode */
if (!common_restrict_check(C, ob)) return;
if (base || (base = BKE_scene_base_find(scene, ob))) {
base->object->restrictflag &= ~OB_RESTRICT_VIEW;
} }
} }
bool object_query__is_restricted_vis_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base || (base = BKE_scene_base_find(scene, ob))) {
return (base->object->restrictflag & OB_RESTRICT_VIEW);
}
campbellbartonUnsubmitted
Not Done
Inline Actions

Checking the base is redundant, You can just use ob , since the base isn't used. This applies to other parts of this patch too.

campbellbarton: Checking the base is redundant, You can just use `ob` , since the `base` isn't used. This…
return false; // No restricted flag, so can't be restricted.
}
void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem) TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{ {
Context not available.
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
ARegion *ar = CTX_wm_region(C); ARegion *ar = CTX_wm_region(C);
outliner_do_object_operation(C, scene, soops, &soops->tree, object_toggle_visibility_cb); bool b_any_restricted_vis = outliner_do_object_query_any_true(C, scene, soops, &soops->tree, object_query__is_restricted_vis_cb);
outliner_do_object_operation(C, scene, soops, &soops->tree, b_any_restricted_vis ? object_unrestrict_visibility_cb : object_restrict_visibility_cb);
DAG_id_type_tag(bmain, ID_OB); DAG_id_type_tag(bmain, ID_OB);
WM_event_add_notifier(C, NC_SCENE | ND_OB_VISIBLE, scene); WM_event_add_notifier(C, NC_SCENE | ND_OB_VISIBLE, scene);
Context not available.
/* Toggle Selectability ---------------------------------------- */ /* Toggle Selectability ---------------------------------------- */
void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te, void object_restrict_selectability_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem) TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{ {
Base *base = (Base *)te->directdata; Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base == NULL) base = BKE_scene_base_find(scene, (Object *)tselem->id);
if (base) { if (base || (base = BKE_scene_base_find(scene, ob))) {
base->object->restrictflag ^= OB_RESTRICT_SELECT; base->object->restrictflag |= OB_RESTRICT_SELECT;
}
}
void object_unrestrict_selectability_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base || (base = BKE_scene_base_find(scene, ob))) {
base->object->restrictflag &= ~OB_RESTRICT_SELECT;
}
}
bool object_query__is_restricted_sel_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base || (base = BKE_scene_base_find(scene, ob))) {
return (base->object->restrictflag & OB_RESTRICT_SELECT);
} }
return false; // No restricted flag, so cant be restricted.
} }
void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
Context not available.
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
ARegion *ar = CTX_wm_region(C); ARegion *ar = CTX_wm_region(C);
outliner_do_object_operation(C, scene, soops, &soops->tree, object_toggle_selectability_cb); bool b_any_restricted_sel = outliner_do_object_query_any_true(C, scene, soops, &soops->tree, object_query__is_restricted_sel_cb);
outliner_do_object_operation(C, scene, soops, &soops->tree, b_any_restricted_sel ? object_unrestrict_selectability_cb : object_restrict_selectability_cb);
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); ED_region_tag_redraw(ar);
Context not available.
/* Toggle Renderability ---------------------------------------- */ /* Toggle Renderability ---------------------------------------- */
void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
void object_restrict_renderability_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{ {
Base *base = (Base *)te->directdata; Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base == NULL) base = BKE_scene_base_find(scene, (Object *)tselem->id);
if (base) { if (base || (base = BKE_scene_base_find(scene, ob))) {
base->object->restrictflag ^= OB_RESTRICT_RENDER; base->object->restrictflag |= OB_RESTRICT_RENDER;
} }
} }
void object_unrestrict_renderability_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base || (base = BKE_scene_base_find(scene, ob))) {
base->object->restrictflag &= ~OB_RESTRICT_RENDER;
}
}
bool object_query__is_restricted_renderability_cb(bContext *C, Scene *scene, TreeElement *te,
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
if (base || (base = BKE_scene_base_find(scene, ob))) {
return (base->object->restrictflag & OB_RESTRICT_RENDER);
}
return false; // No ristricted flag checked so cant be restricted.
}
void group_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), void group_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te),
TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem) TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{ {
Context not available.
SpaceOops *soops = CTX_wm_space_outliner(C); SpaceOops *soops = CTX_wm_space_outliner(C);
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
outliner_do_object_operation(C, scene, soops, &soops->tree, object_toggle_renderability_cb); bool b_any_restricted_rend = outliner_do_object_query_any_true(C, scene, soops, &soops->tree, object_query__is_restricted_renderability_cb);
outliner_do_object_operation(C, scene, soops, &soops->tree, b_any_restricted_rend ? object_unrestrict_renderability_cb : object_restrict_renderability_cb);
DAG_id_type_tag(bmain, ID_OB); DAG_id_type_tag(bmain, ID_OB);
WM_event_add_notifier(C, NC_SCENE | ND_OB_RENDER, scene); WM_event_add_notifier(C, NC_SCENE | ND_OB_RENDER, scene);
Context not available.