diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-02 04:10:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-08-02 04:10:05 +0400 |
| commit | 4ea2fb8b0a13ca74821b6705c683f31eafcd57ae (patch) | |
| tree | 7e76e6fc3688a858dbb51966dbbb38a012c7fcd9 /source/blender/makesdna/DNA_ID.h | |
| parent | 40e3dfd3bd1ff22d293df1d9d7b1b9b90d9bd708 (diff) | |
| parent | 6a6bcea81765976e902a4bac99ff9cbcd0faed55 (diff) | |
Merged changes in the trunk up to revision 49478.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 58964a16aee..476ee4fa369 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -86,7 +86,7 @@ typedef struct IDProperty { #define IDP_STRING_SUB_UTF8 0 /* default */ #define IDP_STRING_SUB_BYTE 1 /* arbitrary byte array, _not_ null terminated */ /*->flag*/ -#define IDP_FLAG_GHOST (1<<7) /* this means the propery is set but RNA will return +#define IDP_FLAG_GHOST (1<<7) /* this means the property is set but RNA will return * false when checking 'RNA_property_is_set', * currently this is a runtime flag */ @@ -239,11 +239,11 @@ typedef struct PreviewImage { #define LIB_LOCAL 0 #define LIB_EXTERN 1 #define LIB_INDIRECT 2 -#define LIB_TEST 8 -#define LIB_TESTEXT (LIB_TEST | LIB_EXTERN) -#define LIB_TESTIND (LIB_TEST | LIB_INDIRECT) +#define LIB_NEED_EXPAND 8 +#define LIB_TESTEXT (LIB_NEED_EXPAND | LIB_EXTERN) +#define LIB_TESTIND (LIB_NEED_EXPAND | LIB_INDIRECT) #define LIB_READ 16 -#define LIB_NEEDLINK 32 +#define LIB_NEED_LINK 32 #define LIB_NEW 256 #define LIB_FAKEUSER 512 |