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

[YimingWu]

Commit: 2d8d86359c9481c01263c773094ce6589d98426a
Author: YimingWu
Date:   Mon Oct 19 11:26:37 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB2d8d86359c9481c01263c773094ce6589d98426a

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

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



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

diff --cc source/blender/gpencil_modifiers/CMakeLists.txt
index 36e15361389,cb4d74559a4..b950b55f7c5
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@@ -77,10 -79,7 +80,12 @@@ if(WITH_INTERNATIONAL
    add_definitions(-DWITH_INTERNATIONAL)
  endif()
  
 +if(WITH_LINEART)
 +  add_definitions(-DWITH_LINEART)
 +endif()
 +
 +add_definitions(${GL_DEFINITIONS})
  
  blender_add_lib(bf_gpencil_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+ 
+ add_dependencies(bf_gpencil_modifiers bf_dna)