Merge branch 'master' into blender2.8

[blender.git] / source / blender / makesrna / RNA_types.h

diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index ecd7f3211bbc87f7a132d15762ce8b5174c0eade..2dac9f67b7abd01633f6f10b24cea16d6c43356b 100644 (file)
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -282,6 +282,7 @@ typedef struct CollectionPropertyIterator {
        union {
                ArrayIterator array;
                ListBaseIterator listbase;
        union {
                ArrayIterator array;
                ListBaseIterator listbase;

+               void *custom;

        } internal;
        int idprop;
        int level;
        } internal;
        int idprop;
        int level;