[Bf-blender-cvs] [5ebebcfbfff] blender2.8: WM: rename manipulator to gizmo internally
Campbell Barton
noreply at git.blender.org
Sat Jul 14 23:53:22 CEST 2018
Commit: 5ebebcfbfff4c218ab4101ee7f6a66617ee9b01f
Author: Campbell Barton
Date: Sat Jul 14 23:49:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5ebebcfbfff4c218ab4101ee7f6a66617ee9b01f
WM: rename manipulator to gizmo internally
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/modules/bpy_types.py
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/screen.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_view.c
M source/blender/draw/intern/draw_view.h
M source/blender/draw/modes/pose_mode.c
M source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
M source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
M source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
M source/blender/editors/gizmo_library/gizmo_draw_utils.c
M source/blender/editors/gizmo_library/gizmo_geometry.h
M source/blender/editors/gizmo_library/gizmo_library_intern.h
M source/blender/editors/gizmo_library/gizmo_library_presets.c
M source/blender/editors/gizmo_library/gizmo_library_utils.c
M source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c
M source/blender/editors/include/ED_gizmo_library.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/interface_region_tooltip.c
M source/blender/editors/interface/resources.c
M source/blender/editors/mesh/editmesh_add_gizmo.c
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/editors/mesh/editmesh_bisect.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_extrude_spin.c
M source/blender/editors/mesh/editmesh_inset.c
M source/blender/editors/mesh/editmesh_polybuild.c
M source/blender/editors/mesh/mesh_intern.h
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_node/node_draw.c
M source/blender/editors/space_node/node_gizmo.c
M source/blender/editors/space_node/node_intern.h
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_gizmo_armature.c
M source/blender/editors/space_view3d/view3d_gizmo_camera.c
M source/blender/editors/space_view3d/view3d_gizmo_empty.c
M source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
M source/blender/editors/space_view3d/view3d_gizmo_lamp.c
M source/blender/editors/space_view3d/view3d_gizmo_navigate.c
M source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
M source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/editors/space_view3d/view3d_header.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_2d.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_ops.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_workspace_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm_api.c
M source/blender/makesrna/intern/rna_wm_gizmo.c
M source/blender/makesrna/intern/rna_wm_gizmo_api.c
M source/blender/makesrna/intern/rna_workspace_api.c
M source/blender/python/intern/bpy.c
M source/blender/python/intern/bpy_gizmo_wrap.c
M source/blender/python/intern/bpy_gizmo_wrap.h
M source/blender/python/intern/bpy_rna.c
M source/blender/python/intern/bpy_rna_gizmo.c
M source/blender/python/intern/bpy_rna_gizmo.h
M source/blender/python/intern/gpu_py_select.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/gizmo/WM_gizmo_api.h
M source/blender/windowmanager/gizmo/WM_gizmo_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
M source/blender/windowmanager/gizmo/wm_gizmo_fn.h
M source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_toolsystem.c
M source/blender/windowmanager/wm_event_system.h
M source/blender/windowmanager/wm_event_types.h
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 666fb03596c..f77b06b56e2 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -239,11 +239,11 @@ const bTheme U_theme_default = {
.xaxis = RGBA(0xff3352ff),
.yaxis = RGBA(0x8bdc00ff),
.zaxis = RGBA(0x2890ffff),
- .manipulator_hi = RGBA(0xffffffff),
- .manipulator_primary = RGBA(0xf5f14dff),
- .manipulator_secondary = RGBA(0x63ffffff),
- .manipulator_a = RGBA(0x4da84dff),
- .manipulator_b = RGBA(0xa33535ff),
+ .gizmo_hi = RGBA(0xffffffff),
+ .gizmo_primary = RGBA(0xf5f14dff),
+ .gizmo_secondary = RGBA(0x63ffffff),
+ .gizmo_a = RGBA(0x4da84dff),
+ .gizmo_b = RGBA(0xa33535ff),
},
.tbuts = {
.back = RGBA(0x42424200),
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 3bdf92f8e63..e9f40bd0c3c 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -581,10 +581,10 @@ class Manipulator(StructRNA):
return super().__delattr__(attr)
from _bpy import (
- _rna_manipulator_target_set_handler as target_set_handler,
- _rna_manipulator_target_get_value as target_get_value,
- _rna_manipulator_target_set_value as target_set_value,
- _rna_manipulator_target_get_range as target_get_range,
+ _rna_gizmo_target_set_handler as target_set_handler,
+ _rna_gizmo_target_get_value as target_get_value,
+ _rna_gizmo_target_set_value as target_set_value,
+ _rna_gizmo_target_get_range as target_get_range,
)
# Convenience wrappers around private `_gawain` module.
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 9cc57bc2c87..4c954874f0d 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -569,7 +569,7 @@ def _activate_by_item(context, space_type, item, index):
name=item.text,
keymap=item.keymap[0].name if item.keymap is not None else "",
cursor=item.cursor or 'DEFAULT',
- manipulator_group=item.widget or "",
+ gizmo_group=item.widget or "",
data_block=item.data_block or "",
operator=item.operator or "",
index=index,
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 0c717aa21d5..e2bca0b6b33 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -238,7 +238,7 @@ class USERPREF_PT_interface(Panel):
col.separator()
- # col.prop(view, "show_manipulator_navigate")
+ # col.prop(view, "show_gizmo_navigate")
sub = col.column(align=True)
@@ -258,10 +258,10 @@ class USERPREF_PT_interface(Panel):
#col.label(text="Open Toolbox Delay:")
#col.prop(view, "open_left_mouse_delay", text="Hold LMB")
#col.prop(view, "open_right_mouse_delay", text="Hold RMB")
- col.prop(view, "show_manipulator", text="Gizmos")
+ col.prop(view, "show_gizmo", text="Gizmos")
sub = col.column()
- sub.active = view.show_manipulator
- sub.prop(view, "manipulator_size", text="Size")
+ sub.active = view.show_gizmo
+ sub.prop(view, "gizmo_size", text="Size")
col.separator()
@@ -934,10 +934,10 @@ class USERPREF_PT_theme(Panel):
padding = subsplit.split(percentage=0.15)
colsub = padding.column()
colsub = padding.column()
- colsub.row().prop(ui, "manipulator_primary")
- colsub.row().prop(ui, "manipulator_secondary")
- colsub.row().prop(ui, "manipulator_a")
- colsub.row().prop(ui, "manipulator_b")
+ colsub.row().prop(ui, "gizmo_primary")
+ colsub.row().prop(ui, "gizmo_secondary")
+ colsub.row().prop(ui, "gizmo_a")
+ colsub.row().prop(ui, "gizmo_b")
col.separator()
col.separator()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3f711ace97e..682af76500b 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3954,7 +3954,7 @@ class VIEW3D_PT_overlay(Panel):
pass
-class VIEW3D_PT_overlay_manipulators(Panel):
+class VIEW3D_PT_overlay_gizmo(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'
bl_parent_id = 'VIEW3D_PT_overlay'
@@ -3962,7 +3962,7 @@ class VIEW3D_PT_overlay_manipulators(Panel):
def draw_header(self, context):
view = context.space_data
- self.layout.prop(view, "show_manipulator", text="")
+ self.layout.prop(view, "show_gizmo", text="")
def draw(self, context):
layout = self.layout
@@ -3975,10 +3975,10 @@ class VIEW3D_PT_overlay_manipulators(Panel):
col.active = display_all
row = col.row(align=True)
- row.active = view.show_manipulator
- row.prop(view, "show_manipulator_navigate", text="Navigate", toggle=True)
- row.prop(view, "show_manipulator_context", text="Active Object", toggle=True)
- row.prop(view, "show_manipulator_tool", text="Active Tools", toggle=True)
+ row.active = view.show_gizmo
+ row.prop(view, "show_gizmo_navigate", text="Navigate", toggle=True)
+ row.prop(view, "show_gizmo_context", text="Active Object", toggle=True)
+ row.prop(view, "show_gizmo_tool", text="Active Tools", toggle=True)
class VIEW3D_PT_overlay_guides(Panel):
@@ -4818,7 +4818,7 @@ classes = (
VIEW3D_PT_shading_options_shadow,
VIEW3D_PT_shading_options_ssao,
VIEW3D_PT_overlay,
- VIEW3D_PT_overlay_manipulators,
+ VIEW3D_PT_overlay_gizmo,
VIEW3D_PT_overlay_guides,
VIEW3D_PT_overlay_object,
VIEW3D_PT_overlay_geometry,
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 9fa00e7f63f..6703d828bf0 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -157,7 +157,7 @@ struct SpaceLink *CTX_wm_space_data(const bContext *C);
struct ARegion *CTX_wm_region(const bContext *C);
void *CTX_wm_region_data(const bContext *C);
struct ARegion *CTX_wm_menu(const bContext *C);
-struct wmManipulatorGroup *CTX_wm_manipulator_group(const bContext *C);
+struct wmGizmoGroup *CTX_wm_gizmo_group(const bContext *C);
struct wmMsgBus *CTX_wm_message_bus(const bContext *C);
struct ReportList *CTX_wm_reports(const bContext *C);
@@ -185,7 +185,7 @@ void CTX_wm_screen_set(bContext *C, struct bScreen *screen); /* to be removed */
void CTX_wm_area_set(bContext *C, struct ScrArea *sa);
void CTX_wm_region_set(bContext *C, struct ARegion *region);
void CTX_wm_menu_set(bContext *C, struct ARegion *menu);
-void CTX_wm_manipulator_group_set(bContext *C, struct wmManipulatorGroup *mgroup);
+void CTX_wm_gizmo_group_set(bContext *C, struct wmGizmoGroup *mgroup);
const char *CTX_wm_operator_poll_msg_get(struct bContext *C);
void CTX_wm_operator_poll_msg_set(struct bContext *C, const char *msg);
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 23f57586ed1..60981c6e76e 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -51,7 +51,7 @@ struct bScreen;
struct uiLayout;
struct uiList;
struct wmKeyConfig;
-struct wmManipulatorMap;
+struct wmGizmoMap;
struct wmNotifier;
struct wmWindow;
struct wmWindowManager;
@@ -104,8 +104,8 @@ typedef struct SpaceType {
/* on startup, define dropboxes for spacetype+regions */
void (*dropboxes)(void);
- /* initialize manipulator-map-types and manipulator-group-types with the region */
- void (*manipulators)(void);
+ /* initialize gizmo-map-types and gizmo-group-types with the region */
+ void (*gizmos)(void);
/* return context data */
int (*context)(const struct bContext *C, const char *member, struct bContextDataResult *result);
@@ -325,9 +325,9 @@ void BKE_spacedata_id_unref(struct ScrArea *sa, struct SpaceLink *sl, struct ID
struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar);
void BKE_area_region_free(struct SpaceType *st, struct ARegion *ar);
void BKE_screen_area_free(struct ScrArea *sa);
-/* Manipulator-maps of a region need to be freed with the region. Uses callback to avoid low-level call. */
-void BKE_region_callback_free_manipulatormap_set(void (*callback)(struct wmManipulatorMap *));
-void BKE_region_callback_refresh_tag_manipulatormap_set(void (*callback)(struct wmManipulatorMap *));
+/* Gizmo-maps of a region need to be freed with the region. Uses callback to avoid low-level call. */
+void BKE_region_callback_free_gizmomap_set(void (*callback)(struct wmGizmoMap *));
+void BKE_region_callback_refresh_tag_gizmomap_set(void (*callback)(struct wmGizmoMap *));
struct ARegion *BKE_area_find_region_type(struct ScrArea *sa, int type);
struct ARegion *BKE_area_find_region_active_win(struct ScrArea *sa);
@@ -344,7 +344,7 @@ unsigned int BKE_screen_view3d_layer_active(
unsigned int BKE_screen_view3d_layer_all(const struct bScreen *sc) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1);
-void BKE_screen_manipulator_tag_refresh(struct bScreen *sc);
+void BKE_screen_gizmo_tag_refresh(struct bScreen *sc);
void BKE_screen_view3d_sync(struct View3D *v3d, struct Scene *scene);
void BKE_screen_view3d_scene_sync(struct bScreen *sc, struct Scene *scene);
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 23c2147ff7e..66020679bf7 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -300,7 +300,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
DATA_SWAP(font_path_ui_mono);
DATA_SWAP(keyconfigstr);
- DATA_SWAP(manipulator_flag);
+ DATA_SWAP(gizmo_flag);
DATA_SWAP(app_flag);
/* We could add others. */
diff
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list