[Bf-blender-cvs] [ef5bc97] temp_widgets_update_tagging: Cleanup: Remove tmp functions added for work on this branch
Julian Eisel
noreply at git.blender.org
Wed May 18 00:11:44 CEST 2016
Commit: ef5bc97e63ae8616a7339507ef88979ebb5d52e3
Author: Julian Eisel
Date: Wed May 18 00:10:27 2016 +0200
Branches: temp_widgets_update_tagging
https://developer.blender.org/rBef5bc97e63ae8616a7339507ef88979ebb5d52e3
Cleanup: Remove tmp functions added for work on this branch
And some other minor cleanup
===================================================================
M source/blender/editors/object/object_edit.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_widgets.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/widgets/WM_widget_api.h
M source/blender/windowmanager/widgets/intern/wm_widgetgroup.c
===================================================================
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 86adb48..4767847 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2201,7 +2201,7 @@ void OBJECT_OT_game_physics_copy(struct wmOperatorType *ot)
static int object_widget_add_exec(bContext *C, wmOperator *UNUSED(op))
{
Object *ob = ED_object_active_context((bContext *)C);
- wmWidgetGroupType *wgrouptype = WM_widgetgrouptype_register_update(
+ wmWidgetGroupType *wgrouptype = WM_widgetgrouptype_register(
CTX_data_main(C),
&(const struct wmWidgetMapType_Params) {"View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, WM_WIDGETMAPTYPE_3D},
WIDGETGROUP_object_manipulator_poll,
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 9164f53..d090c4c 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -2796,7 +2796,7 @@ static void widgetgroup_backdrop_refresh(const struct bContext *C, wmWidgetGroup
static wmWidgetGroupType *graph_widget_backdrop_transform_widgets(void)
{
/* no poll, lives always for the duration of the operator */
- return WM_widgetgrouptype_register_update(
+ return WM_widgetgrouptype_register(
NULL,
&(const struct wmWidgetMapType_Params) {"Graph_Canvas", SPACE_IPO, RGN_TYPE_WINDOW, 0},
NULL,
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 8182df4..90ab2a9 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -592,7 +592,7 @@ static void image_widgets(void)
wmWidgetMapType *wmaptype = WM_widgetmaptype_ensure(&wmap_params);
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_manipulator2d_poll,
WIDGETGROUP_manipulator2d_init,
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index 53af8d4..88b15ef 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -920,7 +920,7 @@ static void node_widgets(void)
wmWidgetMapType *wmaptype = WM_widgetmaptype_ensure(&(const struct wmWidgetMapType_Params) {
"Node_Canvas", SPACE_NODE, RGN_TYPE_WINDOW, 0});
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_node_transform_poll,
WIDGETGROUP_node_transform_init,
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index 9b51d38..6fc5e77 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -296,7 +296,7 @@ static void widgetgroup_overdrop_refresh(const bContext *C, wmWidgetGroup *wgrou
static wmWidgetGroupType *sequencer_overdrop_widgets(void)
{
/* no poll, lives always for the duration of the operator */
- return WM_widgetgrouptype_register_update(
+ return WM_widgetgrouptype_register(
NULL,
&(const struct wmWidgetMapType_Params) {"Seq_Canvas", SPACE_SEQ, RGN_TYPE_WINDOW, 0},
NULL,
@@ -473,7 +473,7 @@ static void widgetgroup_image_transform_refresh(const bContext *C, wmWidgetGroup
static wmWidgetGroupType *sequencer_image_transform_widgets(void)
{
/* no poll, lives always for the duration of the operator */
- return WM_widgetgrouptype_register_update(
+ return WM_widgetgrouptype_register(
NULL,
&(const struct wmWidgetMapType_Params) {"Seq_Canvas", SPACE_SEQ, RGN_TYPE_PREVIEW, 0},
NULL,
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index f08b76e..14c82aa 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -743,7 +743,7 @@ static void view3d_widgets(void)
wmWidgetMapType *wmaptype = WM_widgetmaptype_ensure(&wmap_params);
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_armature_facemaps_poll,
WIDGETGROUP_armature_facemaps_init,
@@ -751,7 +751,7 @@ static void view3d_widgets(void)
NULL,
WM_widgetgroup_keymap_common_sel,
"Face Map Widgets");
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_lamp_poll,
WIDGETGROUP_lamp_init,
@@ -759,7 +759,7 @@ static void view3d_widgets(void)
NULL,
WM_widgetgroup_keymap_common,
"Lamp Widgets");
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_forcefield_poll,
WIDGETGROUP_forcefield_init,
@@ -767,7 +767,7 @@ static void view3d_widgets(void)
NULL,
WM_widgetgroup_keymap_common,
"Force Field Widgets");
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_camera_poll,
WIDGETGROUP_camera_init,
@@ -775,7 +775,7 @@ static void view3d_widgets(void)
NULL,
WM_widgetgroup_keymap_common,
"Camera Widgets");
- WM_widgetgrouptype_register_ptr_update(
+ WM_widgetgrouptype_register_ptr(
NULL, wmaptype,
WIDGETGROUP_manipulator_poll,
WIDGETGROUP_manipulator_init,
diff --git a/source/blender/editors/space_view3d/view3d_widgets.c b/source/blender/editors/space_view3d/view3d_widgets.c
index fc30437..b57ec12 100644
--- a/source/blender/editors/space_view3d/view3d_widgets.c
+++ b/source/blender/editors/space_view3d/view3d_widgets.c
@@ -166,16 +166,16 @@ void WIDGETGROUP_camera_init(const bContext *C, wmWidgetGroup *wgroup)
const float color_hi[4] = {1.0f, 1.0, 0.27f, 1.0f};
camgroup->focallen = WIDGET_arrow_new(
- wgroup, "focal_len",
- (WIDGET_ARROW_STYLE_CONE | WIDGET_ARROW_STYLE_CONSTRAINED));
+ wgroup, "focal_len",
+ (WIDGET_ARROW_STYLE_CONE | WIDGET_ARROW_STYLE_CONSTRAINED));
WM_widget_set_flag(camgroup->focallen, WM_WIDGET_SCALE_3D, false);
WM_widget_set_colors(camgroup->focallen, color, color_hi);
cameragroup_property_setup(camgroup->focallen, ob, ca, false);
WM_widget_set_property(camgroup->focallen, ARROW_SLOT_OFFSET_WORLD_SPACE, &cameraptr, "lens");
camgroup->ortho_scale = WIDGET_arrow_new(
- wgroup, "ortho_scale",
- (WIDGET_ARROW_STYLE_CONE | WIDGET_ARROW_STYLE_CONSTRAINED));
+ wgroup, "ortho_scale",
+ (WIDGET_ARROW_STYLE_CONE | WIDGET_ARROW_STYLE_CONSTRAINED));
WM_widget_set_flag(camgroup->ortho_scale, WM_WIDGET_SCALE_3D, false);
WM_widget_set_colors(camgroup->ortho_scale, color, color_hi);
cameragroup_property_setup(camgroup->ortho_scale, ob, ca, true);
@@ -212,7 +212,7 @@ void WIDGETGROUP_camera_refresh(const bContext *C, wmWidgetGroup *wgroup)
const float scale[3] = {1.0f / len_v3(ob->obmat[0]), 1.0f / len_v3(ob->obmat[1]), 1.0f / len_v3(ob->obmat[2])};
const float scale_fac = ca->drawsize;
const float drawsize = is_ortho ? (0.5f * ca->ortho_scale) :
- (scale_fac / ((scale[0] + scale[1] + scale[2]) / 3.0f));
+ (scale_fac / ((scale[0] + scale[1] + scale[2]) / 3.0f));
float offset[3];
float asp[2];
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 4bb57d2..ebc0728 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1612,6 +1612,7 @@ static StructRNA *rna_WidgetGroup_register(
NULL, wmaptype,
(have_function[0]) ? widgetgroup_poll : NULL,
(have_function[2]) ? widgetgroup_draw : NULL,
+ NULL, NULL, /* TODO */
(have_function[1]) ? widgetgroup_keymap_init : NULL,
dummywgt.name);
diff --git a/source/blender/windowmanager/widgets/WM_widget_api.h b/source/blender/windowmanager/widgets/WM_widget_api.h
index 9458fbe..9720f71 100644
--- a/source/blender/windowmanager/widgets/WM_widget_api.h
+++ b/source/blender/windowmanager/widgets/WM_widget_api.h
@@ -76,12 +76,6 @@ void WM_widget_set_colors(struct wmWidget *widget, const float col[4], const flo
struct wmWidgetGroupType *WM_widgetgrouptype_register_ptr(
const struct Main *bmain, struct wmWidgetMapType *wmaptype,
- int (*poll)(const struct bContext *, struct wmWidgetGroupType *), /* wmWidgetGroupPollFunc */
- void (*create)(const struct bContext *, struct wmWidgetGroup *), /* wmWidgetGroupInitFunc */
- struct wmKeyMap *(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config),
- const char *name);
-struct wmWidgetGroupType *WM_widgetgrouptype_register_ptr_update(
- const struct Main *bmain, struct wmWidgetMapType *wmaptype,
int (*poll)(const struct bContext *, struct wmWidgetGroupType *), /* wmWidgetGroupPollFunc */
void (*init)(const struct bContext *, struct wmWidgetGroup *), /* wmWidgetGroupInitFunc */
void (*refresh)(const struct bContext *, struct wmWidgetGroup *), /* wmWidgetGroupRefreshFunc */
@@ -90,12 +84,6 @@ struct wmWidgetGroupType *WM_widgetgrouptype_register_ptr_update(
const char *name);
struct wmWidgetGroupType *WM_widgetgrouptype_register(
const struct Main *bmain, const struct wmWidgetMapType_Params *wmap_params,
- int (*poll)(const struct bContext *, struct wmWidgetGroupType *), /* wmWidgetGroupPollFunc */
- void (*create)(const struct bContext *, struct wmWidgetGroup *), /* wmWidgetGroupInitFunc */
- struct wmKeyMap *(*keymap_init)(const struct wmWidgetGroupType *wgrouptype, struct wmKeyConfig *config),
- const char *name);
-struct wmWidgetGroupType *WM_widgetgrouptype_register_update
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list