diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 17:22:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 17:22:34 +0300 |
commit | eb3ae79c2d473e8621224e0bb21c2e8fad6c7943 (patch) | |
tree | 53797c7ba44b1b37d189bbdcdf7bcfe6352458bd /source/blender/blenkernel/BKE_context.h | |
parent | cf95267456a0c4f988691ecc822c211ff7849c55 (diff) | |
parent | 141f0f4c4717a8f6090515779de10e205455644b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_context.h')
-rw-r--r-- | source/blender/blenkernel/BKE_context.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 34192db318e..bccc7addaad 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -245,6 +245,10 @@ void CTX_data_list_add(bContextDataResult *result, void *data); BLI_freelistN(&ctx_data_list); \ } (void)0 +#define CTX_DATA_BEGIN_WITH_ID(C, Type, instance, member, Type_id, instance_id) \ + CTX_DATA_BEGIN(C, Type, instance, member) \ + Type_id instance_id = ctx_link->ptr.id.data; \ + int ctx_data_list_count(const bContext *C, int (*func)(const bContext *, ListBase *)); #define CTX_DATA_COUNT(C, member) \ |