diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-17 05:51:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-17 05:51:32 +0300 |
commit | 9759059d58fde7b5610d7a2f4dcb9f9ab636bf75 (patch) | |
tree | 09475ac562a480920358ab35ffcf97d4851f2d55 /source | |
parent | ae3754838ab4a11b50d48eb35901e19598057537 (diff) |
Cleanup: use SCE_GIZMO_ prefix for gizmo_flag
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 52 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 12 |
5 files changed, 38 insertions, 38 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 44253bb90c5..0a38c50640f 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -649,7 +649,7 @@ void BKE_scene_init(Scene *sce) sce->toolsettings->uvcalc_flag = UVCALC_TRANSFORM_CORRECT; sce->toolsettings->unwrapper = 1; sce->toolsettings->select_thresh = 0.01f; - sce->toolsettings->gizmo_flag = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; + sce->toolsettings->gizmo_flag = SCE_GIZMO_SHOW_TRANSLATE | SCE_GIZMO_SHOW_ROTATE | SCE_GIZMO_SHOW_SCALE; sce->toolsettings->selectmode = SCE_SELECT_VERTEX; sce->toolsettings->uv_selectmode = UV_SELECT_VERTEX; diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index f065e36d19a..cbf0fa8bb83 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1700,7 +1700,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) { if (scene->toolsettings->gizmo_flag == 0) { - scene->toolsettings->gizmo_flag = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; + scene->toolsettings->gizmo_flag = SCE_GIZMO_SHOW_TRANSLATE | SCE_GIZMO_SHOW_ROTATE | SCE_GIZMO_SHOW_SCALE; } } diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index fbd104290fb..36af5eaf5f1 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -273,9 +273,9 @@ static bool gizmo_is_axis_visible( } } - if ((axis_type == MAN_AXES_TRANSLATE && !(twtype & SCE_MANIP_TRANSLATE)) || - (axis_type == MAN_AXES_ROTATE && !(twtype & SCE_MANIP_ROTATE)) || - (axis_type == MAN_AXES_SCALE && !(twtype & SCE_MANIP_SCALE))) + if ((axis_type == MAN_AXES_TRANSLATE && !(twtype & SCE_GIZMO_SHOW_TRANSLATE)) || + (axis_type == MAN_AXES_ROTATE && !(twtype & SCE_GIZMO_SHOW_ROTATE)) || + (axis_type == MAN_AXES_SCALE && !(twtype & SCE_GIZMO_SHOW_SCALE))) { return false; } @@ -305,34 +305,34 @@ static bool gizmo_is_axis_visible( case MAN_AXIS_SCALE_Z: return (rv3d->twdrawflag & MAN_SCALE_Z); case MAN_AXIS_SCALE_C: - return (rv3d->twdrawflag & MAN_SCALE_C && (twtype & SCE_MANIP_TRANSLATE) == 0); + return (rv3d->twdrawflag & MAN_SCALE_C && (twtype & SCE_GIZMO_SHOW_TRANSLATE) == 0); case MAN_AXIS_TRANS_XY: return (rv3d->twdrawflag & MAN_TRANS_X && rv3d->twdrawflag & MAN_TRANS_Y && - (twtype & SCE_MANIP_ROTATE) == 0); + (twtype & SCE_GIZMO_SHOW_ROTATE) == 0); case MAN_AXIS_TRANS_YZ: return (rv3d->twdrawflag & MAN_TRANS_Y && rv3d->twdrawflag & MAN_TRANS_Z && - (twtype & SCE_MANIP_ROTATE) == 0); + (twtype & SCE_GIZMO_SHOW_ROTATE) == 0); case MAN_AXIS_TRANS_ZX: return (rv3d->twdrawflag & MAN_TRANS_Z && rv3d->twdrawflag & MAN_TRANS_X && - (twtype & SCE_MANIP_ROTATE) == 0); + (twtype & SCE_GIZMO_SHOW_ROTATE) == 0); case MAN_AXIS_SCALE_XY: return (rv3d->twdrawflag & MAN_SCALE_X && rv3d->twdrawflag & MAN_SCALE_Y && - (twtype & SCE_MANIP_TRANSLATE) == 0 && - (twtype & SCE_MANIP_ROTATE) == 0); + (twtype & SCE_GIZMO_SHOW_TRANSLATE) == 0 && + (twtype & SCE_GIZMO_SHOW_ROTATE) == 0); case MAN_AXIS_SCALE_YZ: return (rv3d->twdrawflag & MAN_SCALE_Y && rv3d->twdrawflag & MAN_SCALE_Z && - (twtype & SCE_MANIP_TRANSLATE) == 0 && - (twtype & SCE_MANIP_ROTATE) == 0); + (twtype & SCE_GIZMO_SHOW_TRANSLATE) == 0 && + (twtype & SCE_GIZMO_SHOW_ROTATE) == 0); case MAN_AXIS_SCALE_ZX: return (rv3d->twdrawflag & MAN_SCALE_Z && rv3d->twdrawflag & MAN_SCALE_X && - (twtype & SCE_MANIP_TRANSLATE) == 0 && - (twtype & SCE_MANIP_ROTATE) == 0); + (twtype & SCE_GIZMO_SHOW_TRANSLATE) == 0 && + (twtype & SCE_GIZMO_SHOW_ROTATE) == 0); case MAN_AXIS_APRON_C: return true; } @@ -1165,15 +1165,15 @@ static void gizmo_line_range(const int twtype, const short axis_type, float *r_s switch (axis_type) { case MAN_AXES_TRANSLATE: - if (twtype & SCE_MANIP_SCALE) { + if (twtype & SCE_GIZMO_SHOW_SCALE) { *r_start = *r_len - ofs + 0.075f; } - if (twtype & SCE_MANIP_ROTATE) { + if (twtype & SCE_GIZMO_SHOW_ROTATE) { *r_len += ofs; } break; case MAN_AXES_SCALE: - if (twtype & (SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE)) { + if (twtype & (SCE_GIZMO_SHOW_TRANSLATE | SCE_GIZMO_SHOW_ROTATE)) { *r_len -= ofs + 0.025f; } break; @@ -1347,13 +1347,13 @@ static void gizmogroup_init_properties_from_twtype(wmGizmoGroup *gzgroup) } ot_store = {NULL}; GizmoGroup *ggd = gzgroup->customdata; - if (ggd->twtype & SCE_MANIP_TRANSLATE) { + if (ggd->twtype & SCE_GIZMO_SHOW_TRANSLATE) { ggd->axis_type_default = MAN_AXES_TRANSLATE; } - else if (ggd->twtype & SCE_MANIP_ROTATE) { + else if (ggd->twtype & SCE_GIZMO_SHOW_ROTATE) { ggd->axis_type_default = MAN_AXES_ROTATE; } - else if (ggd->twtype & SCE_MANIP_SCALE) { + else if (ggd->twtype & SCE_GIZMO_SHOW_SCALE) { ggd->axis_type_default = MAN_AXES_SCALE; } else { @@ -1380,7 +1380,7 @@ static void gizmogroup_init_properties_from_twtype(wmGizmoGroup *gzgroup) case MAN_AXIS_SCALE_Z: if (axis_idx >= MAN_AXIS_RANGE_TRANS_START && axis_idx < MAN_AXIS_RANGE_TRANS_END) { int draw_options = 0; - if ((ggd->twtype & (SCE_MANIP_ROTATE | SCE_MANIP_SCALE)) == 0) { + if ((ggd->twtype & (SCE_GIZMO_SHOW_ROTATE | SCE_GIZMO_SHOW_SCALE)) == 0) { draw_options |= ED_GIZMO_ARROW_DRAW_FLAG_STEM; } RNA_enum_set(axis->ptr, "draw_options", draw_options); @@ -1492,17 +1492,17 @@ static void WIDGETGROUP_gizmo_setup(const bContext *C, wmGizmoGroup *gzgroup) if (tref == NULL || STREQ(tref->idname, "Transform")) { /* Setup all gizmos, they can be toggled via 'ToolSettings.gizmo_flag' */ - ggd->twtype = SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE; + ggd->twtype = SCE_GIZMO_SHOW_TRANSLATE | SCE_GIZMO_SHOW_ROTATE | SCE_GIZMO_SHOW_SCALE; ggd->use_twtype_refresh = true; } else if (STREQ(tref->idname, "Move")) { - ggd->twtype |= SCE_MANIP_TRANSLATE; + ggd->twtype |= SCE_GIZMO_SHOW_TRANSLATE; } else if (STREQ(tref->idname, "Rotate")) { - ggd->twtype |= SCE_MANIP_ROTATE; + ggd->twtype |= SCE_GIZMO_SHOW_ROTATE; } else if (STREQ(tref->idname, "Scale")) { - ggd->twtype |= SCE_MANIP_SCALE; + ggd->twtype |= SCE_GIZMO_SHOW_SCALE; } BLI_assert(ggd->twtype != 0); ggd->twtype_init = ggd->twtype; @@ -1568,7 +1568,7 @@ static void WIDGETGROUP_gizmo_refresh(const bContext *C, wmGizmoGroup *gzgroup) RNA_float_set(axis->ptr, "length", len); if (axis_idx >= MAN_AXIS_RANGE_TRANS_START && axis_idx < MAN_AXIS_RANGE_TRANS_END) { - if (ggd->twtype & SCE_MANIP_ROTATE) { + if (ggd->twtype & SCE_GIZMO_SHOW_ROTATE) { /* Avoid rotate and translate arrows overlap. */ start_co[2] += 0.215f; } @@ -1639,7 +1639,7 @@ static void WIDGETGROUP_gizmo_draw_prepare(const bContext *C, wmGizmoGroup *gzgr /* XXX maybe unset _HIDDEN flag on redraw? */ if (axis_idx == MAN_AXIS_APRON_C) { - WM_gizmo_set_flag(axis, WM_GIZMO_HIDDEN, (scene->toolsettings->gizmo_flag & SCE_MANIP_DISABLE_APRON) != 0); + WM_gizmo_set_flag(axis, WM_GIZMO_HIDDEN, (scene->toolsettings->gizmo_flag & SCE_GIZMO_DISABLE_APRON) != 0); } else if (gizmo_is_axis_visible(rv3d, ggd->twtype, idot, axis_type, axis_idx)) { WM_gizmo_set_flag(axis, WM_GIZMO_HIDDEN, false); diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index eb1a17a044c..1aff0ae877d 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -2054,11 +2054,11 @@ typedef enum eImagePaintMode { /* ToolSettings.gizmo_flag */ enum { - SCE_MANIP_TRANSLATE = (1 << 0), - SCE_MANIP_ROTATE = (1 << 1), - SCE_MANIP_SCALE = (1 << 2), + SCE_GIZMO_SHOW_TRANSLATE = (1 << 0), + SCE_GIZMO_SHOW_ROTATE = (1 << 1), + SCE_GIZMO_SHOW_SCALE = (1 << 2), - SCE_MANIP_DISABLE_APRON = (1 << 3), + SCE_GIZMO_DISABLE_APRON = (1 << 3), }; /* ToolSettings.gpencil_flags */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 6f5a83db079..ef9855cd571 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -423,9 +423,9 @@ const EnumPropertyItem rna_enum_bake_pass_filter_type_items[] = { }; static const EnumPropertyItem rna_enum_gizmo_items[] = { - {SCE_MANIP_TRANSLATE, "TRANSLATE", 0, "Move", ""}, - {SCE_MANIP_ROTATE, "ROTATE", 0, "Rotate", ""}, - {SCE_MANIP_SCALE, "SCALE", 0, "Scale", ""}, + {SCE_GIZMO_SHOW_TRANSLATE, "TRANSLATE", 0, "Move", ""}, + {SCE_GIZMO_SHOW_ROTATE, "ROTATE", 0, "Rotate", ""}, + {SCE_GIZMO_SHOW_SCALE, "SCALE", 0, "Scale", ""}, {0, NULL, 0, NULL, NULL} }; @@ -578,8 +578,8 @@ static void rna_GPencilInterpolateSettings_type_set(PointerRNA *ptr, int value) static void rna_ToolSettings_gizmo_flag_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNUSED(ptr)) { ToolSettings *ts = scene->toolsettings; - if ((ts->gizmo_flag & (SCE_MANIP_TRANSLATE | SCE_MANIP_ROTATE | SCE_MANIP_SCALE)) == 0) { - ts->gizmo_flag |= SCE_MANIP_TRANSLATE; + if ((ts->gizmo_flag & (SCE_GIZMO_SHOW_TRANSLATE | SCE_GIZMO_SHOW_ROTATE | SCE_GIZMO_SHOW_SCALE)) == 0) { + ts->gizmo_flag |= SCE_GIZMO_SHOW_TRANSLATE; } } @@ -2402,7 +2402,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, "rna_ToolSettings_gizmo_flag_update"); prop = RNA_def_property(srna, "use_gizmo_apron", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "gizmo_flag", SCE_MANIP_DISABLE_APRON); + RNA_def_property_boolean_negative_sdna(prop, NULL, "gizmo_flag", SCE_GIZMO_DISABLE_APRON); RNA_def_property_ui_text(prop, "Click Anywhere", "Handle input not directly over the gizmo"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); |