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:
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index a37536f7022..e7091c78f71 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -385,14 +385,14 @@ typedef struct Object {
short softflag;
/** For restricting view, select, render etc. accessible in outliner. */
- char visibility_flag;
+ short visibility_flag;
- /** Flag for pinning. */
- char shapeflag;
/** Current shape key for menu or pinned. */
short shapenr;
+ /** Flag for pinning. */
+ char shapeflag;
- char _pad3[2];
+ char _pad3[1];
/** Object constraints. */
ListBase constraints;
@@ -675,6 +675,14 @@ enum {
OB_HIDE_VIEWPORT = 1 << 0,
OB_HIDE_SELECT = 1 << 1,
OB_HIDE_RENDER = 1 << 2,
+ OB_HIDE_CAMERA = 1 << 3,
+ OB_HIDE_DIFFUSE = 1 << 4,
+ OB_HIDE_GLOSSY = 1 << 5,
+ OB_HIDE_TRANSMISSION = 1 << 6,
+ OB_HIDE_VOLUME_SCATTER = 1 << 7,
+ OB_HIDE_SHADOW = 1 << 8,
+ OB_HOLDOUT = 1 << 9,
+ OB_SHADOW_CATCHER = 1 << 10
};
/* ob->shapeflag */