diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 15:41:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 15:41:52 +0300 |
| commit | 79dabc537e3e345c3e536a6369b1d130942155c3 (patch) | |
| tree | f590f04ff819c33d0b9185f4a361f92ad79404c1 /source/blender/editors/space_outliner/outliner_intern.h | |
| parent | b0c32818ba401a81c18f89f931d4336d8e859bc2 (diff) | |
| parent | 3527857cdca1f5d07037f20fed9840efe1954a57 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_intern.h')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 0ab22208841..0763933b102 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -245,8 +245,8 @@ void outliner_do_object_operation( int common_restrict_check(struct bContext *C, struct Object *ob); -int outliner_has_one_flag(ListBase *lb, short flag, const int curlevel); -bool outliner_set_flag(ListBase *lb, short flag, short set); +int outliner_flag_is_any_test(ListBase *lb, short flag, const int curlevel); +bool outliner_flag_set(ListBase *lb, short flag, short set); void object_toggle_visibility_cb( struct bContext *C, struct ReportList *reports, struct Scene *scene, |