[Bf-blender-cvs] [8d8ae5cb16a] custom-manipulators: Sync with 2.8, various minor redundant changes
Campbell Barton
noreply at git.blender.org
Wed Jun 7 15:27:12 CEST 2017
Commit: 8d8ae5cb16a252273598ce82a3b393363f246e84
Author: Campbell Barton
Date: Wed Jun 7 23:28:20 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB8d8ae5cb16a252273598ce82a3b393363f246e84
Sync with 2.8, various minor redundant changes
===================================================================
M source/blender/blenkernel/intern/camera.c
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_ops.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
===================================================================
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 69e80e889ca..be75048492c 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -360,7 +360,6 @@ void BKE_camera_params_compute_matrix(CameraParams *params)
/***************************** Camera View Frame *****************************/
-/* keep logic in sync with WIDGETGROUP_camera_create */
void BKE_camera_view_frame_ex(
const Scene *scene, const Camera *camera,
const float drawsize, const bool do_clip, const float scale[3],
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 6fc16c8e9d2..dec8bf7d615 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -80,9 +80,6 @@ void ED_region_info_draw(struct ARegion *ar, const char *text, float fill_col
void ED_region_info_draw_multiline(ARegion *ar, const char *text_array[], float fill_color[4], const bool full_redraw);
void ED_region_image_metadata_draw(int x, int y, struct ImBuf *ibuf, const rctf *frame, float zoomx, float zoomy);
void ED_region_grid_draw(struct ARegion *ar, float zoomx, float zoomy);
-void ED_region_draw_backdrop_view3d(const struct bContext *C, struct Object *camera, const float alpha,
- const float width, const float height, const float x, const float y,
- const float zoomx, const float zoomy, const bool draw_background);
float ED_region_blend_factor(struct ARegion *ar);
void ED_region_visible_rect(struct ARegion *ar, struct rcti *rect);
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 848a1ca72b7..69d27e30b1f 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -42,7 +42,6 @@ struct BezTriple;
struct BoundBox;
struct Depsgraph;
struct EditBone;
-struct wmEvent;
struct ImBuf;
struct MVert;
struct Main;
@@ -65,9 +64,6 @@ struct wmOperator;
struct wmOperatorType;
struct wmWindow;
struct wmWindowManager;
-struct wmManipulator;
-struct wmManipulatorGroup;
-struct wmManipulatorGroupType;
struct GPUFX;
struct GPUOffScreen;
struct GPUFXSettings;
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 40d63450bff..b3c95aa0712 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -73,8 +73,6 @@ struct bNodeSocket;
struct wmDropBox;
struct wmDrag;
struct wmEvent;
-struct wmManipulator;
-struct wmManipulatorGroup;
typedef struct uiBut uiBut;
typedef struct uiBlock uiBlock;
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 2148ebe4b8c..ace3bb5b4f8 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -765,7 +765,4 @@ typedef struct uiRNACollectionSearch {
} uiRNACollectionSearch;
void ui_rna_collection_search_cb(const struct bContext *C, void *arg, const char *str, uiSearchItems *items);
-/* interface_generic_widgets.c */
-void UI_OT_lamp_position(struct wmOperatorType *ot);
-
#endif /* __INTERFACE_INTERN_H__ */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 3fc8ba59210..fe232e37886 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -94,7 +94,6 @@
#include "ED_screen.h"
#include "ED_util.h"
#include "ED_image.h"
-#include "ED_transform.h" /* for object manipulator widgets */
#include "RNA_access.h"
#include "RNA_define.h"
@@ -2027,44 +2026,6 @@ void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-#if 0
-static int object_widget_add_exec(bContext *C, wmOperator *UNUSED(op))
-{
- Object *ob = ED_object_active_context((bContext *)C);
- wmManipulatorMapType *mmaptype = WM_manipulatormaptype_find(&(const struct wmManipulatorMapType_Params) {
- "View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW});
- wmManipulatorGroupType *wgrouptype = WM_manipulatorgrouptype_append(mmaptype, TRANSFORM_WGT_object);
- /* assign the objects id name to the widget */
- strcpy(wgrouptype->idname, ob->id.name);
-
- WM_main_add_notifier(NC_OBJECT | ND_DRAW, NULL);
-
- return OPERATOR_FINISHED;
-}
-
-void OBJECT_OT_widget_add(wmOperatorType *ot)
-{
- PropertyRNA *prop;
-
- /* identifiers */
- ot->name = "Add Widget";
- ot->description = "Add a widget to the active object";
- ot->idname = "OBJECT_OT_widget_add";
-
- /* api callbacks */
- ot->invoke = WM_menu_invoke;
- ot->exec = object_widget_add_exec;
- ot->poll = ED_operator_object_active;
-
- /* flags */
- ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
- /* properties */
- prop = RNA_def_enum(ot->srna, "type", rna_enum_wm_widget_type_items, 0, "Type", "Select the type of widget to add");
- ot->prop = prop;
-}
-#endif
-
/* generic utility function */
bool ED_object_editmode_calc_active_center(Object *obedit, const bool select_only, float r_center[3])
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index a09f93ea0e8..ed64f1c8ec1 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -93,8 +93,6 @@ void OBJECT_OT_game_property_move(struct wmOperatorType *ot);
void OBJECT_OT_logic_bricks_copy(struct wmOperatorType *ot);
void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot);
-void OBJECT_OT_widget_add(wmOperatorType *ot);
-
/* object_select.c */
void OBJECT_OT_select_all(struct wmOperatorType *ot);
void OBJECT_OT_select_random(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 3ab6828d637..5641f62ec7a 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -258,10 +258,6 @@ void ED_operatortypes_object(void)
WM_operatortype_append(OBJECT_OT_data_transfer);
WM_operatortype_append(OBJECT_OT_datalayout_transfer);
WM_operatortype_append(OBJECT_OT_surfacedeform_bind);
-
-#if 0
- WM_operatortype_append(OBJECT_OT_widget_add);
-#endif
}
void ED_operatormacros_object(void)
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index 5a0866993b4..cbb8e98e7e0 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -142,13 +142,6 @@ static void graph_panel_view(const bContext *C, Panel *pa)
row = uiLayoutSplit(sub, 0.7f, true);
uiItemR(row, &spaceptr, "cursor_position_y", 0, IFACE_("Cursor Y"), ICON_NONE);
uiItemEnumO(row, "GRAPH_OT_snap", IFACE_("To Keys"), 0, "type", GRAPHKEYS_SNAP_VALUE);
-
- col = uiLayoutColumn(pa->layout, false);
- uiItemR(col, &spaceptr, "show_backdrop", 0, NULL, ICON_NONE);
- col = uiLayoutColumn(pa->layout, false);
- uiLayoutSetActive(col, RNA_boolean_get(&spaceptr, "show_backdrop"));
- uiItemR(col, &spaceptr, "backdrop_camera", 0, "Camera", ICON_NONE);
- uiItemR(col, &spaceptr, "backdrop_opacity", 0, "Opacity", ICON_NONE);
}
/* ******************* active F-Curve ************** */
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index fa457a9eb02..665808c500f 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -39,10 +39,7 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
-#include "IMB_imbuf_types.h"
-
#include "BKE_context.h"
-#include "BKE_image.h"
#include "BKE_library.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index a4fa6e4f66b..0b1fe21cbcf 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -87,7 +87,6 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
-#include "GPU_buffers.h"
#include "GPU_draw.h"
#include "GPU_select.h"
#include "GPU_basic_shader.h"
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 70e946baa16..397781110b4 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -152,9 +152,7 @@ typedef struct Object {
bAnimVizSettings avs; /* settings for visualization of object-transform animation */
bMotionPath *mpath; /* motion path cache for this object */
-
- struct wmManipulatorGroup *wgroup; /* group of widgets assigned to this object */
-
+
ListBase constraintChannels DNA_DEPRECATED; // XXX deprecated... old animation system
ListBase effect DNA_DEPRECATED; // XXX deprecated... keep for readfile
ListBase defbase; /* list of bDeformGroup (vertex groups) names and flag only */
@@ -303,7 +301,6 @@ typedef struct Object {
struct CurveCache *curve_cache;
struct DerivedMesh *derivedDeform, *derivedFinal;
- void *pad4; /* 32 bit only */
uint64_t lastDataMask; /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */
uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */
unsigned int state; /* bit masks of game controllers that are active */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 9c98f19c1bd..75ae1cdab95 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -45,7 +45,6 @@ struct PanelType;
struct Scene;
struct uiLayout;
struct wmTimer;
-struct wmManipulatorMap;
typedef struct bScreen {
ID id;
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 167cb0ca14a..6c526d125d6 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/m
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list