[Bf-blender-cvs] [5aa70ac5898] temp-lanpr-review: Merge remote-tracking branch 'origin/master' into temp-lanpr-review

[YimingWu]

Commit: 5aa70ac589819f5fad037b179241d68067845b77
Author: YimingWu
Date:   Wed Nov 27 10:18:09 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rB5aa70ac589819f5fad037b179241d68067845b77

Merge remote-tracking branch 'origin/master' into temp-lanpr-review

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



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

diff --cc source/blender/makesrna/intern/CMakeLists.txt
index 03801107f98,f3ade54d5ec..1f97793124c
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@@ -401,21 -400,11 +405,17 @@@ set(LI
    bf_editor_render
    bf_editor_scene
    bf_editor_sculpt_paint
-   bf_editor_space_clip
-   bf_editor_space_file
-   bf_editor_space_image
-   bf_editor_space_info
-   bf_editor_space_node
-   bf_editor_space_view3d
+   bf_editor_sound
    bf_editor_transform
+   bf_editor_undo
  )
  
 +if(WITH_LANPR)
 +  list(APPEND LIB
 +    bf_editor_lanpr
 +  )
 +endif()
 +
  add_definitions(${GL_DEFINITIONS})
  
  blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")