[Bf-blender-cvs] [04f7eca61aa] custom-manipulators: Remove unused register+init functions
Campbell Barton
noreply at git.blender.org
Tue Jun 13 08:47:49 CEST 2017
Commit: 04f7eca61aa921b2de42a67361339d98e5810eee
Author: Campbell Barton
Date: Tue Jun 13 15:15:09 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB04f7eca61aa921b2de42a67361339d98e5810eee
Remove unused register+init functions
This needs to be split out for dynamic registered types anyway.
===================================================================
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
===================================================================
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index a72830e19d4..8f5878d8cc6 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -108,13 +108,6 @@ struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr(
struct wmManipulatorMapType *mmaptype,
void (*mgrouptype_func)(struct wmManipulatorGroupType *, void *),
void *userdata);
-struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_runtime(
- const struct Main *main, struct wmManipulatorMapType *mmaptype,
- void (*mgrouptype_func)(struct wmManipulatorGroupType *));
-struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr_runtime(
- const struct Main *main, struct wmManipulatorMapType *mmaptype,
- void (*mgrouptype_func)(struct wmManipulatorGroupType *, void *),
- void *userdata);
void WM_manipulatorgrouptype_init_runtime(
const struct Main *bmain, struct wmManipulatorMapType *mmaptype,
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
index ac478fe5e95..8f1480ed984 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
@@ -545,35 +545,6 @@ wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr(
return wgt;
}
-/**
- * Use this for registering manipulators on runtime.
- */
-wmManipulatorGroupType *WM_manipulatorgrouptype_append_runtime(
- const Main *main, wmManipulatorMapType *mmaptype,
- void (*wgt_func)(wmManipulatorGroupType *))
-{
- wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_append(mmaptype, wgt_func);
-
- /* Main is missing on startup when we create new areas.
- * So this is only called for manipulators initialized on runtime */
- WM_manipulatorgrouptype_init_runtime(main, mmaptype, wgt);
-
- return wgt;
-}
-wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr_runtime(
- const Main *main, wmManipulatorMapType *mmaptype,
- void (*wgt_func)(wmManipulatorGroupType *, void *),
- void *userdata)
-{
- wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_append_ptr(mmaptype, wgt_func, userdata);
-
- /* Main is missing on startup when we create new areas.
- * So this is only called for manipulators initialized on runtime */
- WM_manipulatorgrouptype_init_runtime(main, mmaptype, wgt);
-
- return wgt;
-}
-
void WM_manipulatorgrouptype_init_runtime(
const Main *bmain, wmManipulatorMapType *mmaptype,
wmManipulatorGroupType *wgt)
More information about the Bf-blender-cvs
mailing list