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/makesdna/DNA_collection_types.h
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/makesdna/DNA_collection_types.h')
-rw-r--r--source/blender/makesdna/DNA_collection_types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index 9183537e2f0..c7f3ef4156d 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -76,10 +76,10 @@ typedef struct Collection {
/* Collection->flag */
enum {
- COLLECTION_RESTRICT_INSTANCE = (1 << 0), /* Hidden in viewport. */
+ COLLECTION_RESTRICT_VIEWPORT = (1 << 0), /* Disable in viewports. */
COLLECTION_RESTRICT_SELECT = (1 << 1), /* Not selectable in viewport. */
COLLECTION_DISABLED_DEPRECATED = (1 << 2), /* Not used anymore */
- COLLECTION_RESTRICT_RENDER = (1 << 3), /* Hidden in renders. */
+ COLLECTION_RESTRICT_RENDER = (1 << 3), /* Disable in renders. */
COLLECTION_HAS_OBJECT_CACHE = (1 << 4), /* Runtime: object_cache is populated. */
COLLECTION_IS_MASTER = (1 << 5), /* Is master collection embedded in the scene. */
};