[Bf-blender-cvs] [67852caf0b3] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 67852caf0b3bb7630c1c713258d721e5253e1032
Author: YimingWu
Date:   Sat Nov 7 15:07:01 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB67852caf0b3bb7630c1c713258d721e5253e1032

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	CMakeLists.txt
#	source/blender/blenloader/intern/readfile.c
#	source/blender/blenloader/intern/writefile.c

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



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

diff --cc CMakeLists.txt
index e240e3d8a2c,15b272a8d2e..f142dd99fe7
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1816,25 -1813,24 +1816,25 @@@ if(FIRST_RUN
    message(STATUS "C++ Compiler: \"${CMAKE_CXX_COMPILER_ID}\"")
  
    info_cfg_text("Build Options:")
+   info_cfg_option(WITH_ALEMBIC)
    info_cfg_option(WITH_BULLET)
-   info_cfg_option(WITH_IK_SOLVER)
-   info_cfg_option(WITH_IK_ITASC)
-   info_cfg_option(WITH_OPENCOLLADA)
-   info_cfg_option(WITH_FFTW3)
-   info_cfg_option(WITH_INTERNATIONAL)
-   info_cfg_option(WITH_INPUT_NDOF)
    info_cfg_option(WITH_CYCLES)
+   info_cfg_option(WITH_FFTW3)
    info_cfg_option(WITH_FREESTYLE)
+   info_cfg_option(WITH_GMP)
+   info_cfg_option(WITH_IK_ITASC)
+   info_cfg_option(WITH_IK_SOLVER)
+   info_cfg_option(WITH_INPUT_NDOF)
+   info_cfg_option(WITH_INTERNATIONAL)
 +  info_cfg_option(WITH_LINEART)
+   info_cfg_option(WITH_OPENCOLLADA)
    info_cfg_option(WITH_OPENCOLORIO)
-   info_cfg_option(WITH_XR_OPENXR)
    info_cfg_option(WITH_OPENIMAGEDENOISE)
    info_cfg_option(WITH_OPENVDB)
-   info_cfg_option(WITH_ALEMBIC)
    info_cfg_option(WITH_QUADRIFLOW)
-   info_cfg_option(WITH_USD)
    info_cfg_option(WITH_TBB)
-   info_cfg_option(WITH_GMP)
+   info_cfg_option(WITH_USD)
+   info_cfg_option(WITH_XR_OPENXR)
  
    info_cfg_text("Compiler Options:")
    info_cfg_option(WITH_BUILDINFO)
diff --cc source/blender/blenloader/intern/readfile.c
index 5be3161ee92,2c10dd446f1..b1596ded05d
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -44,60 -44,17 +44,18 @@@
  #define DNA_DEPRECATED_ALLOW
  
  #include "DNA_anim_types.h"
- #include "DNA_armature_types.h"
- #include "DNA_brush_types.h"
  #include "DNA_cachefile_types.h"
- #include "DNA_camera_types.h"
- #include "DNA_cloth_types.h"
- #include "DNA_collection_types.h"
- #include "DNA_constraint_types.h"
- #include "DNA_curveprofile_types.h"
- #include "DNA_dynamicpaint_types.h"
- #include "DNA_effect_types.h"
  #include "DNA_fileglobal_types.h"
- #include "DNA_fluid_types.h"
  #include "DNA_genfile.h"
- #include "DNA_gpencil_modifier_types.h"
- #include "DNA_gpencil_types.h"
- #include "DNA_hair_types.h"
- #include "DNA_ipo_types.h"
  #include "DNA_key_types.h"
- #include "DNA_lattice_types.h"
  #include "DNA_layer_types.h"
- #include "DNA_light_types.h"
- #include "DNA_lightprobe_types.h"
 +#include "DNA_lineart_types.h"
- #include "DNA_linestyle_types.h"
- #include "DNA_mask_types.h"
- #include "DNA_material_types.h"
- #include "DNA_mesh_types.h"
- #include "DNA_meshdata_types.h"
- #include "DNA_meta_types.h"
- #include "DNA_movieclip_types.h"
- #include "DNA_nla_types.h"
  #include "DNA_node_types.h"
- #include "DNA_object_fluidsim_types.h"
- #include "DNA_object_types.h"
  #include "DNA_packedFile_types.h"
- #include "DNA_particle_types.h"
- #include "DNA_pointcache_types.h"
- #include "DNA_pointcloud_types.h"
- #include "DNA_rigidbody_types.h"
- #include "DNA_scene_types.h"
- #include "DNA_screen_types.h"
  #include "DNA_sdna_types.h"
- #include "DNA_sequence_types.h"
- #include "DNA_shader_fx_types.h"
- #include "DNA_simulation_types.h"
  #include "DNA_sound_types.h"
- #include "DNA_space_types.h"
- #include "DNA_speaker_types.h"
- #include "DNA_text_types.h"
- #include "DNA_vfont_types.h"
- #include "DNA_view3d_types.h"
  #include "DNA_volume_types.h"
  #include "DNA_workspace_types.h"
- #include "DNA_world_types.h"
  
  #include "MEM_guardedalloc.h"
  
diff --cc source/blender/blenloader/intern/writefile.c
index 79fc29eb8dc,b640c9f5788..3bb23ad2ec9
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -93,39 -93,9 +93,10 @@@
  /* allow writefile to use deprecated functionality (for forward compatibility code) */
  #define DNA_DEPRECATED_ALLOW
  
- #include "DNA_anim_types.h"
- #include "DNA_armature_types.h"
- #include "DNA_cachefile_types.h"
- #include "DNA_cloth_types.h"
- #include "DNA_collection_types.h"
- #include "DNA_constraint_types.h"
- #include "DNA_curveprofile_types.h"
- #include "DNA_dynamicpaint_types.h"
  #include "DNA_fileglobal_types.h"
- #include "DNA_fluid_types.h"
- #include "DNA_genfile.h"
- #include "DNA_lightprobe_types.h"
 +#include "DNA_lineart_types.h"
- #include "DNA_linestyle_types.h"
- #include "DNA_mask_types.h"
- #include "DNA_material_types.h"
- #include "DNA_mesh_types.h"
- #include "DNA_meshdata_types.h"
- #include "DNA_movieclip_types.h"
- #include "DNA_object_force_types.h"
- #include "DNA_object_types.h"
- #include "DNA_particle_types.h"
- #include "DNA_pointcache_types.h"
- #include "DNA_rigidbody_types.h"
- #include "DNA_scene_types.h"
- #include "DNA_screen_types.h"
+ #include "DNA_genfile.h"
  #include "DNA_sdna_types.h"
- #include "DNA_sequence_types.h"
- #include "DNA_shader_fx_types.h"
- #include "DNA_space_types.h"
- #include "DNA_view3d_types.h"
- #include "DNA_windowmanager_types.h"
- #include "DNA_workspace_types.h"
  
  #include "BLI_bitmap.h"
  #include "BLI_blenlib.h"