[Bf-blender-cvs] [8fe1403] temp_widgets_files_refactor: Correct widget map type flag name

Julian Eisel noreply at git.blender.org
Mon Feb 8 20:10:22 CET 2016


Commit: 8fe1403d6b7ed3f4d2c46b9ab0f91953288e382c
Author: Julian Eisel
Date:   Mon Feb 8 20:08:58 2016 +0100
Branches: temp_widgets_files_refactor
https://developer.blender.org/rB8fe1403d6b7ed3f4d2c46b9ab0f91953288e382c

Correct widget map type flag name

===================================================================

M	source/blender/editors/object/object_edit.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/windowmanager/widgets/WM_widgets_types.h
M	source/blender/windowmanager/widgets/wm_widgetmap.c

===================================================================

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 77b993f..4b15d91 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2139,7 +2139,7 @@ static int object_widget_add_exec(bContext *C, wmOperator *UNUSED(op))
 	Object *ob = ED_object_active_context((bContext *)C);
 	wmWidgetGroupType *wgrouptype = WM_widgetgrouptype_register(
 	        CTX_data_main(C),
-	        &(const struct wmWidgetMapType_Params) {"View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, WM_WIDGET_TYPE_3D},
+	        &(const struct wmWidgetMapType_Params) {"View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, WM_WIDGETMAPTYPE_3D},
 	        WIDGETGROUP_object_manipulator_poll,
 	        WIDGETGROUP_object_manipulator_create,
 	        WM_widgetgroup_keymap_common,
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index d8b5482..dfc8e41 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -502,7 +502,7 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *ar)
 
 	if (BLI_listbase_is_empty(&ar->widgetmaps)) {
 		wmWidgetMap *wmap = WM_widgetmap_from_type(&(const struct wmWidgetMapType_Params) {
-		        "View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, WM_WIDGET_TYPE_3D});
+		        "View3D", SPACE_VIEW3D, RGN_TYPE_WINDOW, WM_WIDGETMAPTYPE_3D});
 		BLI_addhead(&ar->widgetmaps, wmap);
 	}
 
@@ -738,7 +738,7 @@ static void view3d_widgets(void)
 	const struct wmWidgetMapType_Params wmap_params = {
 		.idname = "View3D",
 		.spaceid = SPACE_VIEW3D, .regionid = RGN_TYPE_WINDOW,
-		.flag = WM_WIDGET_TYPE_3D,
+		.flag = WM_WIDGETMAPTYPE_3D,
 	};
 
 	wmWidgetMapType *wmaptype = WM_widgetmaptype_ensure(&wmap_params);
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 11f5366..83bf9ea 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -442,7 +442,7 @@ EnumPropertyItem rna_enum_operator_return_items[] = {
 
 #ifndef RNA_RUNTIME
 static EnumPropertyItem widget_flag_items[] = {
-	{WM_WIDGET_TYPE_3D, "3D", 0, "3D", "Use the 3d viewport"},
+	{WM_WIDGETMAPTYPE_3D, "3D", 0, "3D", "Use the 3d viewport"},
 	{0, NULL, 0, NULL, NULL}
 };
 #endif
diff --git a/source/blender/windowmanager/widgets/WM_widgets_types.h b/source/blender/windowmanager/widgets/WM_widgets_types.h
index ffa778e..c4161ef 100644
--- a/source/blender/windowmanager/widgets/WM_widgets_types.h
+++ b/source/blender/windowmanager/widgets/WM_widgets_types.h
@@ -123,14 +123,14 @@ enum eWidgetFlag {
 	WM_WIDGET_SELECTABLE  = (1 << 8),
 };
 
-/* wmWidgetType->flag */
-enum eWidgetTypeFlag {
+/* wmWidgetMapType->flag */
+enum eWidgetMapTypeFlag {
 	/**
 	 * Check if widgetmap does 3D drawing
 	 * (uses a different kind of interaction),
 	 * - 3d: use glSelect buffer.
 	 * - 2d: use simple cursor position intersection test. */
-	WM_WIDGET_TYPE_3D           = (1 << 0),
+	WM_WIDGETMAPTYPE_3D           = (1 << 0),
 };
 
 #endif  /* __WM_WIDGETS_TYPES__ */
diff --git a/source/blender/windowmanager/widgets/wm_widgetmap.c b/source/blender/windowmanager/widgets/wm_widgetmap.c
index 39cc41a..d3017ea 100644
--- a/source/blender/windowmanager/widgets/wm_widgetmap.c
+++ b/source/blender/windowmanager/widgets/wm_widgetmap.c
@@ -476,7 +476,7 @@ bool WM_widgetmap_select_all(bContext *C, wmWidgetMap *wmap, const int action)
 
 bool wm_widgetmap_is_3d(const wmWidgetMap *wmap)
 {
-	return (wmap->type->flag & WM_WIDGET_TYPE_3D) != 0;
+	return (wmap->type->flag & WM_WIDGETMAPTYPE_3D) != 0;
 }
 
 void wm_widgetmap_handler_context(bContext *C, wmEventHandler *handler)
@@ -663,7 +663,7 @@ wmWidgetMapType *WM_widgetmaptype_find(
 {
 	wmWidgetMapType *wmaptype;
 	/* flags which differentiates widget groups */
-	const int flag_cmp = WM_WIDGET_TYPE_3D;
+	const int flag_cmp = WM_WIDGETMAPTYPE_3D;
 	const int flag_test = wmap_params->flag & flag_cmp;
 
 	for (wmaptype = widgetmaptypes.first; wmaptype; wmaptype = wmaptype->next) {




More information about the Bf-blender-cvs mailing list