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/space_action | |
| parent | feb7852e1ba55b4c7f697ec52fee672a8cc2261c (diff) | |
| parent | b3004d30f5d5060035c5f8ac4cb6338463872877 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_action')
| -rw-r--r-- | source/blender/editors/space_action/action_buttons.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_action/action_data.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_action/action_edit.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/editors/space_action/action_buttons.c b/source/blender/editors/space_action/action_buttons.c index 82768bedc95..3ba59b3be75 100644 --- a/source/blender/editors/space_action/action_buttons.c +++ b/source/blender/editors/space_action/action_buttons.c @@ -49,7 +49,6 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_fcurve.h" -#include "BKE_main.h" #include "BKE_screen.h" #include "BKE_unit.h" diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index ca8dbbce1a1..f1153b5bed0 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -56,7 +56,6 @@ #include "BKE_fcurve.h" #include "BKE_library.h" #include "BKE_key.h" -#include "BKE_main.h" #include "BKE_nla.h" #include "BKE_scene.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 72b1245ca8a..1c15a7c5950 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -59,7 +59,6 @@ #include "BKE_global.h" #include "BKE_library.h" #include "BKE_key.h" -#include "BKE_main.h" #include "BKE_nla.h" #include "BKE_context.h" #include "BKE_report.h" |