diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-09-03 16:39:09 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-09-03 16:39:09 +0300 |
| commit | 37590a6a11d2d8db5b1dd4cc6fd900ece021ed7f (patch) | |
| tree | f52323422cfb040ba5d74f4c9f99cbca4a15ad16 /source/blender/makesdna | |
| parent | d35efde18163fd0820cafd4f19be1ebaad8cdc92 (diff) | |
| parent | 51d8facbc3275211841fc90e93875e1af88ca4a0 (diff) | |
Merge branch 'master' into filebrowser_redesignfilebrowser_redesign
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 613871b1fee..ff1839f997c 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -686,6 +686,7 @@ enum { OB_EMPTY_IMAGE_HIDE_ORTHOGRAPHIC = 1 << 1, OB_EMPTY_IMAGE_HIDE_BACK = 1 << 2, OB_EMPTY_IMAGE_HIDE_FRONT = 1 << 3, + OB_EMPTY_IMAGE_HIDE_NON_AXIS_ALIGNED = 1 << 4, }; /** #Object.empty_image_flag */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 5f5bd3142c4..5e96759bc90 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -2002,6 +2002,8 @@ extern const char *RE_engine_id_CYCLES; (((workspace)->object_mode & OD_MODE_EDIT) ? OBACT(_view_layer) : NULL) #define OBEDIT_FROM_OBACT(ob) ((ob) ? (((ob)->mode & OB_MODE_EDIT) ? ob : NULL) : NULL) #define OBPOSE_FROM_OBACT(ob) ((ob) ? (((ob)->mode & OB_MODE_POSE) ? ob : NULL) : NULL) +#define OBWEIGHTPAINT_FROM_OBACT(ob) \ + ((ob) ? (((ob)->mode & OB_MODE_WEIGHT_PAINT) ? ob : NULL) : NULL) #define OBEDIT_FROM_VIEW_LAYER(view_layer) OBEDIT_FROM_OBACT(OBACT(view_layer)) #define V3D_CAMERA_LOCAL(v3d) ((!(v3d)->scenelock && (v3d)->camera) ? (v3d)->camera : NULL) |