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

[YimingWu]

Commit: a7d6caf94ed1975f3ecb353cd40cfee14a766668
Author: YimingWu
Date:   Fri Sep 18 13:13:26 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBa7d6caf94ed1975f3ecb353cd40cfee14a766668

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

# Conflicts:
#	source/blender/editors/object/CMakeLists.txt

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



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

diff --cc source/blender/editors/object/CMakeLists.txt
index a30020500bf,a1f8061c9f7..e3640b91ed4
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@@ -86,8 -86,9 +86,13 @@@ if(WITH_INTERNATIONAL
    add_definitions(-DWITH_INTERNATIONAL)
  endif()
  
 +if(WITH_LINEART)
 +  add_definitions(-DWITH_LINEART)
 +endif()
++  
+ if(WITH_EXPERIMENTAL_FEATURES)
+   add_definitions(-DWITH_PARTICLE_NODES)
+   add_definitions(-DWITH_HAIR_NODES)
+ endif()
  
  blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")