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
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2019-05-14 23:45:47 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-05-15 00:10:25 +0300
commit777a546c0c789648f0f75315333d99e58050cd09 (patch)
treea0cd7fd54d8d894f9c1ef9368d49ed167087b539 /source/blender/editors/animation/anim_filter.c
parent903041e1c0eaf1797573f193be6d5561a907278e (diff)
Outliner Restriction: Naming sanitization and icon
No major API change here, only in the outliner restriction column variables (e.g., show_restrict_column_selectable > show_restrict_column_select). * Get rid of _INSTANCE (introduced on b1af68200159). * Differentiate (everywhere but the API) between HIDE (temporary) and VIEWPORT (global). * Use the expected icon for restrict viewport (same as objects and modifiers). * selectable > select
Diffstat (limited to 'source/blender/editors/animation/anim_filter.c')
-rw-r--r--source/blender/editors/animation/anim_filter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 7e3c85268db..a228d819286 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1823,7 +1823,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac,
}
/* outliner restrict-flag */
- if (ob->restrictflag & OB_RESTRICT_INSTANCE) {
+ if (ob->restrictflag & OB_RESTRICT_VIEWPORT) {
continue;
}
}
@@ -3022,7 +3022,7 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Base *base, int filter_m
}
/* outliner restrict-flag */
- if (ob->restrictflag & OB_RESTRICT_INSTANCE) {
+ if (ob->restrictflag & OB_RESTRICT_VIEWPORT) {
return false;
}
}