Commit: 03f67fd5b0e6c68632bfaa21efa61343f721f994
Author: Campbell Barton
Date: Sat Jun 17 11:31:49 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB03f67fd5b0e6c68632bfaa21efa61343f721f994
Cleanup: unused code
===================================================================
M source/blender/editors/include/ED_manipulator_library.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/transform/transform_manipulator.c
===================================================================
diff --git a/source/blender/editors/include/ED_manipulator_library.h
b/source/blender/editors/include/ED_manipulator_library.h
index 924ba7bf792..7d92f4311d4 100644
--- a/source/blender/editors/include/ED_manipulator_library.h
+++ b/source/blender/editors/include/ED_manipulator_library.h
@@ -132,11 +132,6 @@ void ED_manipulator_grab3d_set_style(struct wmManipulator
*mpr, int style);
void ED_manipulator_grab3d_set_up_vector(
struct wmManipulator *mpr, const float direction[3]);
-/* -------------------------------------------------------------------- */
-/* Facemap Manipulator */
-
-struct bFaceMap *ED_manipulator_facemap_get_fmap(struct wmManipulator *mpr);
-
/* -------------------------------------------------------------------- */
/* Primitive Manipulator */
diff --git a/source/blender/editors/include/ED_transform.h
b/source/blender/editors/include/ED_transform.h
index da5a0cdcf2b..483caf7c475 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -159,8 +159,6 @@ void Transform_Properties(struct wmOperatorType *ot, int
flags);
void TRANSFORM_WGT_manipulator(struct wmManipulatorGroupType *wgt);
-void TRANSFORM_WGT_object(struct wmManipulatorGroupType *wgt);
-
bool ED_widgetgroup_manipulator2d_poll(const struct bContext *C, struct
wmManipulatorGroupType *wgt);
void ED_widgetgroup_manipulator2d_setup(const struct bContext *C, struct
wmManipulatorGroup *mgroup);
void ED_widgetgroup_manipulator2d_refresh(const struct bContext *C, struct
wmManipulatorGroup *mgroup);
diff --git a/source/blender/editors/transform/transform_manipulator.c
b/source/blender/editors/transform/transform_manipulator.c
index 6b6e68987f9..13053e3290d 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1375,44 +1375,3 @@ void TRANSFORM_WGT_manipulator(wmManipulatorGroupType
*wgt)
wgt->refresh = WIDGETGROUP_manipulator_refresh;
wgt->draw_prepare = WIDGETGROUP_manipulator_draw_prepare;
}
-
-
-/* -------------------------------------------------------------------- */
-/* Custom Object Manipulator (unfinished - unsure if this will stay) */
-#if 0
-static void WIDGETGROUP_object_manipulator_init(const bContext *C,
wmManipulatorGroup *mgroup)
-{
- Object *ob = ED_object_active_context((bContext *)C);
-
- if (ob->mgroup == NULL) {
- ob->mgroup = mgroup;
- }
-
- WIDGETGROUP_manipulator_setup(C, mgroup);
-}
-
-static bool WIDGETGROUP_object_manipulator_poll(const bContext *C,
wmManipulatorGroupType *wgt)
-{
- Object *ob = ED_object_active_context((bContext *)C);
-
- if (ED_operator_object_active((bContext *)C)) {
- if (STREQ(wgt->idname, ob->id.name)) {
- return true;
- }
- }
- return false;
-}
-
-/* XXX should this really be in transform_manipulator.c? */
-void TRANSFORM_WGT_object(wmManipulatorGroupType *wgt)
-{
- wgt->name = "Object Widgets";
-
- wgt->poll = WIDGETGROUP_object_manipulator_poll;
- wgt->setup = WIDGETGROUP_object_manipulator_init;
- wgt->refresh = WIDGETGROUP_manipulator_refresh;
- wgt->draw_prepare = WIDGETGROUP_manipulator_draw_prepare;
-
- wgt->flag |= (WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
-}
-#endif
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
