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:
authorClément Foucault <foucault.clem@gmail.com>2019-03-20 18:33:17 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-03-20 18:33:49 +0300
commitc5fc861172879102034129ecbe653e91eeff5caf (patch)
tree8619b3e2b97f48eeaac874b28c9db999fedf5c76 /source/blender/makesdna/DNA_object_types.h
parent3508ffc34c1f742e6a798814b80075ccbe1baa22 (diff)
Fix T58550 Dragged in images dont overlap properly
This patch adds a new "Use Alpha" option on image empties to avoid ordering issue of reference images. If ordering is not important, "Use Alpha" can be enabled to provide transparency and alpha blending support.
Diffstat (limited to 'source/blender/makesdna/DNA_object_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_types.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 136acb9dc1c..e97ae722457 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -372,7 +372,8 @@ typedef struct Object {
ImageUser *iuser;
char empty_image_visibility_flag;
char empty_image_depth;
- char _pad8[2];
+ char empty_image_flag;
+ char _pad8[1];
int select_id;
@@ -670,6 +671,11 @@ enum {
OB_EMPTY_IMAGE_HIDE_FRONT = 1 << 3,
};
+/** #Object.empty_image_flag */
+enum {
+ OB_EMPTY_IMAGE_USE_ALPHA_BLEND = 1 << 0,
+};
+
#define MAX_DUPLI_RECUR 8
#ifdef __cplusplus