diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
| commit | 8901263b5f04152a9c6a897c5115acd51be11bf1 (patch) | |
| tree | 14629685150a04440e2629fd45bd90891b8767ed /source/blender/editors/gpencil | |
| parent | f64df0e1024c2447ad449d0bf63def871ee47925 (diff) | |
| parent | 714e85b5344db7d9c9c7ac0a91cd0bb574c35353 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index e118e490f25..fa9acc36a2b 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -74,7 +74,6 @@ #include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_screen.h" #include "ED_space_api.h" #include "gpencil_intern.h" |