[Bf-blender-cvs] [9372e8a] temp_manipulators_core: More renaming (widget->manipulator): Variables, sturct members, comments, etc
Julian Eisel
noreply at git.blender.org
Sun Sep 11 23:08:26 CEST 2016
Commit: 9372e8a16b06f086cca452dcb5e19c4495c0397d
Author: Julian Eisel
Date: Sun Sep 11 23:06:15 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB9372e8a16b06f086cca452dcb5e19c4495c0397d
More renaming (widget->manipulator): Variables, sturct members, comments, etc
===================================================================
M source/blender/CMakeLists.txt
M source/blender/blenkernel/intern/screen.c
M source/blender/editors/interface/resources.c
R078 source/blender/makesdna/DNA_widget_types.h source/blender/makesdna/DNA_manipulator_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/WM_manipulator_library.h
M source/blender/windowmanager/manipulators/WM_manipulator_types.h
M source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
M source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
M source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
M source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
M source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_intern.h
M source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
M source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
M source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
M source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
M source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
M source/blender/windowmanager/wm_event_system.h
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 92d0fbe..300baca 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -56,6 +56,7 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_manipulator_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meshdata_types.h
@@ -87,7 +88,6 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vfont_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view2d_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h
- ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_widget_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index eff98ad..7023fce 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -342,9 +342,9 @@ void BKE_area_region_free(SpaceType *st, ARegion *ar)
}
}
- for (wmManipulatorMap *wmap = ar->widgetmaps.first, *wmap_tmp; wmap; wmap = wmap_tmp) {
- wmap_tmp = wmap->next;
- WM_manipulatormap_delete(wmap); /* XXX shouldn't be in blenkernel */
+ for (wmManipulatorMap *mmap = ar->manipulator_maps.first, *mmap_tmp; mmap; mmap = mmap_tmp) {
+ mmap_tmp = mmap->next;
+ WM_manipulatormap_delete(mmap); /* XXX shouldn't be in blenkernel */
}
BLI_freelistN(&ar->ui_lists);
BLI_freelistN(&ar->ui_previews);
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 2676581..4f30bf4 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1656,8 +1656,8 @@ void init_userdef_do_versions(void)
U.tw_size = 25; /* percentage of window size */
U.tw_handlesize = 16; /* percentage of widget radius */
}
- if (U.widget_scale == 0)
- U.widget_scale = 75;
+ if (U.manipulator_scale == 0)
+ U.manipulator_scale = 75;
if (U.pad_rot_angle == 0.0f)
U.pad_rot_angle = 15.0f;
diff --git a/source/blender/makesdna/DNA_widget_types.h b/source/blender/makesdna/DNA_manipulator_types.h
similarity index 78%
rename from source/blender/makesdna/DNA_widget_types.h
rename to source/blender/makesdna/DNA_manipulator_types.h
index 2e957808..9a3289b 100644
--- a/source/blender/makesdna/DNA_widget_types.h
+++ b/source/blender/makesdna/DNA_manipulator_types.h
@@ -15,35 +15,28 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file DNA_widget_types.h
+/** \file DNA_manipulator_types.h
* \ingroup DNA
*/
-#ifndef __DNA_WIDGET_TYPES_H__
-#define __DNA_WIDGET_TYPES_H__
+#ifndef __DNA_MANIPULATOR_TYPES_H__
+#define __DNA_MANIPULATOR_TYPES_H__
-typedef enum WidgetType {
+typedef enum ManipulatorType {
WT_TRANSLATE = 0,
WT_ROTATE = 1,
WT_SCALE = 2,
WT_CUSTOM = 3,
-} WidgetType;
+} ManipulatorType;
typedef struct wmManipulatorGroup {
struct wmManipulatorGroup *next, *prev;
struct wmManipulatorGroupType *type;
- ListBase widgets;
+ ListBase manipulators;
void *py_instance; /* python stores the class instance here */
struct ReportList *reports; /* errors and warnings storage */
@@ -54,4 +47,4 @@ typedef struct wmManipulatorGroup {
int pad;
} wmManipulatorGroup;
-#endif /* __DNA_WIDGET_TYPES_H__ */
+#endif /* __DNA_MANIPULATOR_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index f2442ee..bafdb61 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -264,7 +264,7 @@ typedef struct ARegion {
ListBase ui_lists; /* uiList */
ListBase ui_previews; /* uiPreview */
ListBase handlers; /* wmEventHandler */
- ListBase widgetmaps; /* widgetmaps */
+ ListBase manipulator_maps; /* manipulator-maps */
ListBase panels_category; /* Panel categories runtime */
struct wmTimer *regiontimer; /* blend in/out */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 0541a8a..74e665a 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -46,7 +46,7 @@
#include "DNA_node_types.h" /* for bNodeInstanceKey */
/* Hum ... Not really nice... but needed for spacebuts. */
#include "DNA_view2d_types.h"
-#include "DNA_widget_types.h"
+#include "DNA_manipulator_types.h"
struct ID;
struct Text;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 5b807fa..14dd3f9 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -490,7 +490,7 @@ typedef struct UserDef {
short tb_leftmouse, tb_rightmouse;
struct SolidLight light[3];
short tw_hotspot, tw_flag, tw_handlesize, tw_size;
- short widget_flag, widget_scale;
+ short manipulator_flag, manipulator_scale;
int pad3;
short textimeout, texcollectrate;
short wmdrawmethod; /* removed wmpad */
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index a4a3395..0ba5c9387 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -368,8 +368,8 @@ enum {
#define V3D_USE_MANIPULATOR 1
#define V3D_DRAW_MANIPULATOR 2
/* #define V3D_CALC_MANIPULATOR 4 */ /*UNUSED*/
-#define V3D_3D_WIDGETS (1 << 2)
-#define V3D_SHADED_WIDGETS (1 << 3)
+#define V3D_3D_MANIPULATORS (1 << 2)
+#define V3D_SHADED_MANIPULATORS (1 << 3)
/* BGPic->flag */
/* may want to use 1 for select ? */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 21c9ddb..a4b9ffd 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -77,6 +77,7 @@ static const char *includefiles[] = {
"DNA_image_types.h",
"DNA_texture_types.h",
"DNA_lamp_types.h",
+ "DNA_manipulator_types.h",
"DNA_material_types.h",
"DNA_vfont_types.h",
"DNA_meta_types.h",
@@ -118,7 +119,6 @@ static const char *includefiles[] = {
"DNA_cloth_types.h",
"DNA_gpencil_types.h",
"DNA_windowmanager_types.h",
- "DNA_widget_types.h",
"DNA_anim_types.h",
"DNA_boid_types.h",
"DNA_smoke_types.h",
@@ -1331,7 +1331,7 @@ int main(int argc, char **argv)
#include "DNA_cloth_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_windowmanager_types.h"
-#include "DNA_widget_types.h"
+#include "DNA_manipulator_types.h"
#include "DNA_anim_types.h"
#include "DNA_boid_types.h"
#include "DNA_smoke_types.h"
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index e3f4b95..f2df6c0 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -42,7 +42,7 @@
#include "WM_keymap.h"
#include "BLI_compiler_attrs.h"
-/* Include external widget API's */
+/* Include external manipulator API's */
#include "manipulators/WM_manipulator_api.h"
#include "manipulators/WM_manipulator_library.h"
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index f080c59..de808dc 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -567,8 +567,8 @@ typedef struct wmOperatorType {
/* pointer to modal keymap, do not free! */
struct wmKeyMap *modalkeymap;
- /* widget group that is accessible while operator runs */
- wmManipulatorGroupType *wgrouptype;
+ /* manipulator-group that is accessible while operator runs */
+ wmManipulatorGroupType *mgrouptype;
/* python needs the operator type as well */
int (*pyop_poll)(struct bContext *, struct wmOperatorType *ot) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 57d65cd..4f9b323 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1675,9 +1675,9 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand
wm_region_mouse_co(C, event);
wm_event_modalkeymap(C, op, event, &dbl_click_disabled);
- /* attach widgetmap to handler if not there yet */
- if (ot->wgrouptype && !handler->widgetmap) {
- wm_manipulatorgroup_attach_to_modal_handler(C, handler, ot->wgrouptype, op);
+ /* attach manipulator-map to handler if not there yet */
+ if (ot->mgrouptype && !handler->manipulator_map) {
+ wm_manipulatorgroup_attach_to_modal_handler(C, handler, ot->mgrouptype, op);
}
if (ot->flag & OPTYPE_UNDO)
@@ -1728,7 +1728,7 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand
CTX_wm_region_set(C, NULL);
}
- /* update widgets during modal handlers */
+ /* update manipulators during modal handlers */
wm_manipulatormaps_handled_modal_update(C, event, handler, ot);
/* remove modal handler, operator itself should have been canceled and freed */
@@ -2098,31 +2098,31 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
}
}
}
- else if (handler->widgetmap) {
+ else if (handler->manipulator_map) {
ScrArea *area = CTX_wm_area(C);
ARegion *region = CTX_wm_region(C);
- wmManipulatorMap *wmap = handler->widgetmap;
- wmManipulator *widget = wm_manipulatormap_get_highlighted_widget(wmap);
+ wmManipulatorMap *mmap = handler->m
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list