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

[YimingWu]

Commit: 941ed655a87c94df5481d3098a72ae50731816ee
Author: YimingWu
Date:   Thu Jun 25 14:09:03 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB941ed655a87c94df5481d3098a72ae50731816ee

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

# Conflicts:
#	CMakeLists.txt
#	release/datafiles/locale
#	release/scripts/addons
#	release/scripts/addons_contrib
#	source/blender/editors/space_buttons/CMakeLists.txt

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



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

diff --cc CMakeLists.txt
index 16f4c28f8a5,60c6f638370..cb783c4acb5
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -321,17 -321,6 +321,9 @@@ mark_as_advanced(WITH_SYSTEM_GLOG
  # Freestyle
  option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
  
 +# LANPR
 +option(WITH_LANPR     "Enable LANPR (more advanced edges rendering)" ON)
 +
- # New object types
- option(WITH_NEW_OBJECT_TYPES "Enable new hair and pointcloud objects (use for development only, don't save in files)" OFF)
- mark_as_advanced(WITH_NEW_OBJECT_TYPES)
- 
- # New simulation data block
- option(WITH_NEW_SIMULATION_TYPE "Enable simulation data block (use for development only, don't save in files)" OFF)
- mark_as_advanced(WITH_NEW_SIMULATION_TYPE)
- 
  # Misc
  if(WIN32)
    option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
diff --cc source/blender/editors/space_buttons/CMakeLists.txt
index 41eab7a9b6d,25ff6bbd098..c8a3577de6b
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@@ -54,12 -54,4 +54,8 @@@ if(WITH_FREESTYLE
    add_definitions(-DWITH_FREESTYLE)
  endif()
  
 +if(WITH_LANPR)
 +  add_definitions(-DWITH_LANPR)
 +endif()
 +
- if(WITH_NEW_OBJECT_TYPES)
-   add_definitions(-DWITH_NEW_OBJECT_TYPES)
- endif()
- 
  blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")