[Bf-blender-cvs] [f191e28] wiggly-widgets: Cleanup: Naming
Julian Eisel
noreply at git.blender.org
Sun Nov 15 18:34:07 CET 2015
Commit: f191e28294b314170fd1cefe07ade40b06b44fbf
Author: Julian Eisel
Date: Sun Nov 15 17:56:54 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBf191e28294b314170fd1cefe07ade40b06b44fbf
Cleanup: Naming
===================================================================
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 2083878..b97a552 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -906,7 +906,7 @@ static void WIDGETGROUP_shapekey_draw(const struct bContext *C, struct wmWidgetG
/* draw facemaps depending on the selected bone in pose mode */
#define USE_FACEMAP_FROM_BONE
-static int WIDGETGROUP_armature_facemap_poll(const struct bContext *C, struct wmWidgetGroupType *UNUSED(wgrouptype))
+static int WIDGETGROUP_armature_facemaps_poll(const struct bContext *C, struct wmWidgetGroupType *UNUSED(wgrouptype))
{
Object *ob = CTX_data_active_object(C);
@@ -942,7 +942,7 @@ static int WIDGETGROUP_armature_facemap_poll(const struct bContext *C, struct wm
return false;
}
-static void WIDGET_armature_facemap_select(bContext *C, wmWidget *widget, const int action)
+static void WIDGET_armature_facemaps_select(bContext *C, wmWidget *widget, const int action)
{
Object *ob = CTX_data_active_object(C);
bPoseChannel *pchan;
@@ -960,7 +960,7 @@ static void WIDGET_armature_facemap_select(bContext *C, wmWidget *widget, const
}
}
-static void WIDGETGROUP_armature_facemap_create(const struct bContext *C, struct wmWidgetGroup *wgroup)
+static void WIDGETGROUP_armature_facemaps_create(const struct bContext *C, struct wmWidgetGroup *wgroup)
{
Object *ob = CTX_data_active_object(C);
bArmature *arm = (bArmature *)ob->data;
@@ -986,7 +986,7 @@ static void WIDGETGROUP_armature_facemap_create(const struct bContext *C, struct
WM_widget_set_operator(widget, "TRANSFORM_OT_translate");
WM_widget_set_colors(widget, color_shape, color_shape);
WM_widget_set_flag(widget, WM_WIDGET_DRAW_HOVER, true);
- WM_widget_set_func_select(widget, WIDGET_armature_facemap_select);
+ WM_widget_set_func_select(widget, WIDGET_armature_facemaps_select);
opptr = WM_widget_set_operator(widget, "TRANSFORM_OT_translate");
if ((prop = RNA_struct_find_property(opptr, "release_confirm"))) {
RNA_property_boolean_set(opptr, prop, true);
@@ -1038,8 +1038,8 @@ static void view3d_widgets(void)
{
WM_widgetmaptype_find("View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, true, true);
- WM_widgetgrouptype_new(WIDGETGROUP_armature_facemap_poll,
- WIDGETGROUP_armature_facemap_create,
+ WM_widgetgrouptype_new(WIDGETGROUP_armature_facemaps_poll,
+ WIDGETGROUP_armature_facemaps_create,
WM_widgetgroup_keymap_common,
NULL, "View3D", "Face Map Widgets", SPACE_VIEW3D, RGN_TYPE_WINDOW, true);
WM_widgetgrouptype_new(WIDGETGROUP_lamp_poll,
More information about the Bf-blender-cvs
mailing list