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

[Antonio Vazquez]

Commit: d842334b245a41e71766389a56896f2f028859e1
Author: Antonio Vazquez
Date:   Fri Jul 31 12:06:11 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rBd842334b245a41e71766389a56896f2f028859e1

Merge branch 'master' into lanpr-under-gp

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



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

diff --cc source/blender/editors/util/CMakeLists.txt
index 9ff49534a58,207606c2dcd..1ce02700346
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@@ -62,9 -62,7 +62,8 @@@ set(SR
    ../include/ED_keyframes_draw.h
    ../include/ED_keyframes_edit.h
    ../include/ED_keyframing.h
 +  ../include/ED_lineart.h
    ../include/ED_lattice.h
-   ../include/ED_logic.h
    ../include/ED_markers.h
    ../include/ED_mask.h
    ../include/ED_mball.h
diff --cc source/blender/editors/util/ed_util.c
index 0731d653f93,93762e6500c..8911e5e88f3
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@@ -58,9 -58,7 +58,8 @@@
  #include "DEG_depsgraph.h"
  
  #include "ED_armature.h"
- #include "ED_buttons.h"
  #include "ED_image.h"
 +#include "ED_lineart.h"
  #include "ED_mesh.h"
  #include "ED_node.h"
  #include "ED_object.h"