diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-01-11 16:44:18 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 16:44:18 -0300 |
| commit | 9a6282975938106d17ccd49ef1b8c7fc4b11b3d2 (patch) | |
| tree | 99ea03bf071b792ceb4d65a511173b3190f1dba9 /core | |
| parent | b63384a9f1d318d22f67519de8c93144d45251bb (diff) | |
| parent | 09a6a74074332b964316683fdfca90094f40a2f5 (diff) | |
Merge pull request #15531 from AndreaCatania/p2
Fixed crash on duplicate GIProbe baking
Diffstat (limited to 'core')
| -rw-r--r-- | core/object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/object.h b/core/object.h index 5de87b8a7d..98ce62551b 100644 --- a/core/object.h +++ b/core/object.h @@ -111,6 +111,7 @@ enum PropertyUsageFlags { PROPERTY_USAGE_CLASS_IS_ENUM = 1 << 18, PROPERTY_USAGE_NIL_IS_VARIANT = 1 << 19, PROPERTY_USAGE_INTERNAL = 1 << 20, + PROPERTY_USAGE_DO_NOT_SHARE_ON_DUPLICATE = 1 << 21, // If the object is duplicated also this property will be duplicated PROPERTY_USAGE_DEFAULT = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_NETWORK, PROPERTY_USAGE_DEFAULT_INTL = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_NETWORK | PROPERTY_USAGE_INTERNATIONALIZED, |