[Bf-blender-cvs] [6d3af8e6475] modifier-panels-ui: Merge branch 'master' into modifier-panels-ui

[Hans Goudey]

Commit: 6d3af8e647594f744eec57cb1f84caee64154642
Author: Hans Goudey
Date:   Tue May 5 10:25:53 2020 -0400
Branches: modifier-panels-ui
https://developer.blender.org/rB6d3af8e647594f744eec57cb1f84caee64154642

Merge branch 'master' into modifier-panels-ui

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



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

diff --cc source/blender/gpencil_modifiers/CMakeLists.txt
index a5c0609e1ef,d3c85b891c6..a73fb92dfc2
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@@ -63,9 -60,7 +64,8 @@@ set(SR
    intern/MOD_gpencilthick.c
    intern/MOD_gpenciltime.c
    intern/MOD_gpenciltint.c
-   intern/MOD_gpenciltexture.c
  
 +  intern/MOD_ui_common.h
    MOD_gpencil_modifiertypes.h
  )