Merge remote-tracking branch 'origin/blender-v2.90-release'

source/blender/editors/include/ED_logic.h

@@ -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__ */

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"

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"
 

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"
 

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

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"