[Bf-blender-cvs] [09ecb089a5e] master: Cleanup: Remove unused node editor toolbar file

Hans Goudey noreply at git.blender.org
Tue Jan 18 19:31:23 CET 2022


Commit: 09ecb089a5e228e5543374df93bae0b211f73a5a
Author: Hans Goudey
Date:   Tue Jan 18 12:31:14 2022 -0600
Branches: master
https://developer.blender.org/rB09ecb089a5e228e5543374df93bae0b211f73a5a

Cleanup: Remove unused node editor toolbar file

This file was added nine years ago, and was unused then.
Now with active tools we use a different approach to create
toolbars, so the file is not relevant.

===================================================================

M	source/blender/editors/space_node/CMakeLists.txt
M	source/blender/editors/space_node/node_intern.hh
D	source/blender/editors/space_node/node_toolbar.cc
M	source/blender/editors/space_node/space_node.cc

===================================================================

diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 94b67e43651..41d6388c947 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -51,7 +51,6 @@ set(SRC
   node_relationships.cc
   node_select.cc
   node_templates.cc
-  node_toolbar.cc
   node_view.cc
   space_node.cc
 
diff --git a/source/blender/editors/space_node/node_intern.hh b/source/blender/editors/space_node/node_intern.hh
index 740d1fbb6f9..2e33409405c 100644
--- a/source/blender/editors/space_node/node_intern.hh
+++ b/source/blender/editors/space_node/node_intern.hh
@@ -133,8 +133,6 @@ blender::float2 node_to_view(const bNode &node, const blender::float2 &co);
 void node_to_updated_rect(const bNode &node, rctf &r_rect);
 blender::float2 node_from_view(const bNode &node, const blender::float2 &co);
 
-void node_toolbar_register(ARegionType *art);
-
 void node_operatortypes();
 void node_keymap(wmKeyConfig *keyconf);
 
diff --git a/source/blender/editors/space_node/node_toolbar.cc b/source/blender/editors/space_node/node_toolbar.cc
deleted file mode 100644
index c32dcbef91b..00000000000
--- a/source/blender/editors/space_node/node_toolbar.cc
+++ /dev/null
@@ -1,39 +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) 2012 Blender Foundation.
- * All rights reserved.
- */
-
-/** \file
- * \ingroup nodes
- */
-
-#include "BLI_utildefines.h"
-
-#include "DNA_node_types.h"
-
-#include "BKE_context.h"
-#include "BKE_screen.h"
-
-#include "WM_api.h"
-
-#include "node_intern.hh" /* own include */
-
-/* ******************* node toolbar registration ************** */
-
-void node_toolbar_register(ARegionType *UNUSED(art))
-{
-}
diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc
index 3d936aee8cb..8e986217ffe 100644
--- a/source/blender/editors/space_node/space_node.cc
+++ b/source/blender/editors/space_node/space_node.cc
@@ -1051,7 +1051,5 @@ void ED_spacetype_node()
   art->draw = node_toolbar_region_draw;
   BLI_addhead(&st->regiontypes, art);
 
-  node_toolbar_register(art);
-
   BKE_spacetype_register(st);
 }



More information about the Bf-blender-cvs mailing list