[Bf-blender-cvs] [19b5f837b1b] lanpr-under-gp: Merge branch 'master' into lanpr-under-gp

[Antonio Vazquez]

Commit: 19b5f837b1be94bf7588f9fb4ece2dd60398afab
Author: Antonio Vazquez
Date:   Sat Aug 22 13:11:05 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rB19b5f837b1be94bf7588f9fb4ece2dd60398afab

Merge branch 'master' into lanpr-under-gp

===================================================================



===================================================================

diff --cc source/blender/makesdna/DNA_object_types.h
index 08af6a7353e,586c704e0f1..98868c4fcba
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -411,14 -384,8 +402,10 @@@ typedef struct Object 
    char empty_image_flag;
    char _pad8[5];
  
-   /** Contains data for levels of detail. */
-   ListBase lodlevels;
-   LodLevel *currentlod;
- 
    struct PreviewImage *preview;
  
 +  ObjectLineart lineart;
 +
    /** Runtime evaluation data (keep last). */
    Object_Runtime runtime;
  } Object;