diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-05-19 12:40:56 +0400 |
| commit | a5152b7ca0d6d7f340b1955c0e8a15ba23fda336 (patch) | |
| tree | 1b8289047b989964a442deb8f084a04d07f97b00 /source/blender/makesdna/DNA_ID.h | |
| parent | 8925ed1420ea2557abc7867cf12f89730ef77718 (diff) | |
| parent | 65228807725d57aa4d33bcb8c3e3966d1acf0b8a (diff) | |
Merged changes in the trunk up to revision 46787.
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 2404459889c..814b1d18876 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -226,10 +226,14 @@ typedef struct PreviewImage { #define ID_BLEND_PATH(_bmain, _id) ((_id)->lib ? (_id)->lib->filepath : (_bmain)->name) #ifdef GS -#undef GS +# undef GS #endif #define GS(a) (*((short *)(a))) +#define ID_NEW(a) if ( (a) && (a)->id.newid ) (a) = (void *)(a)->id.newid +#define ID_NEW_US(a) if ( (a)->id.newid) { (a) = (void *)(a)->id.newid; (a)->id.us++; } +#define ID_NEW_US2(a) if (((ID *)a)->newid) { (a) = ((ID *)a)->newid; ((ID *)a)->us++; } + /* id->flag: set frist 8 bits always at zero while reading */ #define LIB_LOCAL 0 #define LIB_EXTERN 1 |