[Bf-blender-cvs] [3f60b2233e7] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 3f60b2233e7433bfc4c77db80e4ceab418d99ef8
Author: Antonio Vazquez
Date:   Mon Sep 14 15:27:47 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3f60b2233e7433bfc4c77db80e4ceab418d99ef8

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/CMakeLists.txt
index c521b0dac2b,20408327105..89084ee16b4
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@@ -29,13 -29,8 +29,9 @@@ set(IN
    ../../windowmanager
    ../../../../intern/glew-mx
    ../../../../intern/guardedalloc
 +  ../../../../extern/potrace/src
  )
  
- set(INC_SYS
-   ${GLEW_INCLUDE_PATH}
- )
- 
  set(SRC
    annotate_draw.c
    annotate_paint.c