diff options
author | Dalai Felinto <dalai@blender.org> | 2020-07-30 19:38:08 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-07-30 19:38:08 +0300 |
commit | d3944940f9862386cfad692b9d338b670584908c (patch) | |
tree | ea672df9a72e668a366dd026db22140d2f0a2147 /source/blender/editors/space_buttons | |
parent | 8dc2fbd7b666b6cf0477627249f1a2b6a4924e9e (diff) | |
parent | 4089b07aa05c68fcbefa0b8b6c574173953e1c85 (diff) |
Merge remote-tracking branch 'origin/blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/space_buttons')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 9e5c630ec60..5885d3dcbb0 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -56,7 +56,6 @@ #include "RNA_access.h" #include "ED_armature.h" -#include "ED_buttons.h" #include "ED_physics.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 3dc5eca8a8b..8e5aa00115b 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -63,7 +63,6 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "ED_buttons.h" #include "ED_node.h" #include "ED_screen.h" |