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 | |
parent | 8dc2fbd7b666b6cf0477627249f1a2b6a4924e9e (diff) | |
parent | 4089b07aa05c68fcbefa0b8b6c574173953e1c85 (diff) |
Merge remote-tracking branch 'origin/blender-v2.90-release'
-rw-r--r-- | source/blender/editors/include/ED_logic.h | 38 | ||||
-rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 1 | ||||
-rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/util/ed_util.c | 1 |
6 files changed, 0 insertions, 43 deletions
diff --git a/source/blender/editors/include/ED_logic.h b/source/blender/editors/include/ED_logic.h deleted file mode 100644 index ae2d5038321..00000000000 --- a/source/blender/editors/include/ED_logic.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - */ - -/** \file - * \ingroup editors - */ - -#ifndef __ED_LOGIC_H__ -#define __ED_LOGIC_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* logic_ops.c */ -void ED_operatortypes_logic(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __ED_LOGIC_H__ */ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 49dbba5eba9..3ae203b563b 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -44,7 +44,6 @@ #include "ED_gizmo_library.h" #include "ED_gpencil.h" #include "ED_lattice.h" -#include "ED_logic.h" #include "ED_markers.h" #include "ED_mask.h" #include "ED_mball.h" 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" diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index f48ea610345..207606c2dcd 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -63,7 +63,6 @@ set(SRC ../include/ED_keyframes_edit.h ../include/ED_keyframing.h ../include/ED_lattice.h - ../include/ED_logic.h ../include/ED_markers.h ../include/ED_mask.h ../include/ED_mball.h diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index dad0b96c5e2..93762e6500c 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -58,7 +58,6 @@ #include "DEG_depsgraph.h" #include "ED_armature.h" -#include "ED_buttons.h" #include "ED_image.h" #include "ED_mesh.h" #include "ED_node.h" |