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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-06-25 14:50:11 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-06-25 15:09:17 +0300
commit817bf582c27d6aa2d19027bb97ed3f708cf6347c (patch)
treee6e6f0afb0bb8fc5a8711fb66c6aa9b39a8d3508 /source/blender/makesdna/DNA_layer_types.h
parenta99dcab148ed209409f3b2479ada12d869ae84b6 (diff)
Cleanup: rename object base flags to be more clear.
Diffstat (limited to 'source/blender/makesdna/DNA_layer_types.h')
-rw-r--r--source/blender/makesdna/DNA_layer_types.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 6b4dcc39005..614e06537f4 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -91,15 +91,19 @@ typedef struct ViewLayer {
/* Base->flag */
enum {
+ /* User controlled flags. */
BASE_SELECTED = (1 << 0), /* Object is selected. */
- BASE_VISIBLED = (1 << 1), /* Object is visible. */
- BASE_SELECTABLED = (1 << 2), /* Object can be selected. */
+ BASE_HIDDEN = (1 << 8), /* Object is hidden for editing. */
+
+ /* Runtime evaluated flags. */
+ BASE_VISIBLE = (1 << 1), /* Object is enabled and visible. */
+ BASE_SELECTABLE = (1 << 2), /* Object can be selected. */
BASE_FROMDUPLI = (1 << 3), /* Object comes from duplicator. */
/* BASE_DEPRECATED = (1 << 4), */
- BASE_FROM_SET = (1 << 5), /* To be set only by the depsgraph */
- BASE_VISIBLE_VIEWPORT = (1 << 6), /* Object is visible in viewport. */
- BASE_VISIBLE_RENDER = (1 << 7), /* Object is visible in final render */
- BASE_HIDE = (1 << 8), /* Object is hidden for editing. */
+ BASE_FROM_SET = (1 << 5), /* Object comes from set. */
+ BASE_ENABLED_VIEWPORT = (1 << 6), /* Object is enabled in viewport. */
+ BASE_ENABLED_RENDER = (1 << 7), /* Object is enabled in final render */
+ BASE_ENABLED = (1 << 9), /* Object is enabled. */
};
/* LayerCollection->flag */