Merge branch 'master' into blender2.8

[blender.git] / source / blender / makesdna / DNA_ID.h

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index cb51e168ec2dc9a8658d22bca345f014eb7cf180..5eb7afb4e004c080a2c5caad041db1c83b9ac3c3 100644 (file)
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -142,7 +142,6 @@ typedef struct ID {
  */
 typedef struct Library {
        ID id;
-       ID *idblock;
        struct FileData *filedata;
        char name[1024];  /* path name used for reading, can be relative and edited in the outliner */
 
@@ -155,6 +154,9 @@ typedef struct Library {
        struct Library *parent; /* set for indirectly linked libs, used in the outliner and while reading */
        
        struct PackedFile *packedfile;
+
+       int temp_index;
+       int _pad;
 } Library;
 
 enum eIconSizes {