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

[Antonio Vazquez]

Commit: b5c859609651fe508ba84f34ec00e08adb42e512
Author: Antonio Vazquez
Date:   Tue Aug 18 16:14:11 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rBb5c859609651fe508ba84f34ec00e08adb42e512

Merge branch 'master' into lanpr-under-gp

 Conflicts:
	source/blender/editors/space_buttons/CMakeLists.txt

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



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

diff --cc source/blender/editors/space_buttons/CMakeLists.txt
index fce9aa40d80,75d91174470..4bca025104e
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@@ -54,8 -54,9 +54,13 @@@ if(WITH_FREESTYLE
    add_definitions(-DWITH_FREESTYLE)
  endif()
  
+ if(WITH_EXPERIMENTAL_FEATURES)
+   add_definitions(-DWITH_PARTICLE_NODES)
+   add_definitions(-DWITH_HAIR_NODES)
+ endif()
+ 
 +if(WITH_LINEART)
 +  add_definitions(-DWITH_LINEART)
 +endif()
 +
  blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")