diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-05-14 23:45:47 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-05-15 00:10:25 +0300 |
| commit | 777a546c0c789648f0f75315333d99e58050cd09 (patch) | |
| tree | a0cd7fd54d8d894f9c1ef9368d49ed167087b539 /source/blender/blenkernel/intern/object_dupli.c | |
| parent | 903041e1c0eaf1797573f193be6d5561a907278e (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/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 044d6da9466..0dedbb7e934 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -1082,7 +1082,7 @@ static const DupliGenerator *get_dupli_generator(const DupliContext *ctx) /* Should the dupli's be generated for this object? - Respect restrict flags */ if (DEG_get_mode(ctx->depsgraph) == DAG_EVAL_RENDER ? (restrictflag & OB_RESTRICT_RENDER) : - (restrictflag & OB_RESTRICT_INSTANCE)) { + (restrictflag & OB_RESTRICT_VIEWPORT)) { return NULL; } |