diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 15:19:51 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 15:19:51 +0300 |
commit | a2c0a382cd00b9b1a3058ad0017887e451b73465 (patch) | |
tree | be978c24be659a22afb22eb53c52c468e4087c06 /source/blender/editors/gpencil | |
parent | feb7852e1ba55b4c7f697ec52fee672a8cc2261c (diff) | |
parent | b3004d30f5d5060035c5f8ac4cb6338463872877 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 1 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_undo.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index c25e4d3ea73..77e5dc8fe5d 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -46,7 +46,6 @@ #include "PIL_time.h" -#include "BKE_main.h" #include "BKE_paint.h" #include "BKE_gpencil.h" #include "BKE_context.h" diff --git a/source/blender/editors/gpencil/gpencil_undo.c b/source/blender/editors/gpencil/gpencil_undo.c index 7a9ad2b32c0..202d7630ae0 100644 --- a/source/blender/editors/gpencil/gpencil_undo.c +++ b/source/blender/editors/gpencil/gpencil_undo.c @@ -45,7 +45,6 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_main.h" #include "ED_gpencil.h" |