archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Manipulator: flip scale flag usage

Browse Source 
Naming was confusing, while technically correct -
the result is no scaling (manipulator ignores zoom-level).

Also remove 3D from name since this can be supported for 2D views too.
This commit is contained in:
Campbell Barton
2017-06-23 15:50:55 +10:00
parent 0a5d7efab3
commit 16b807e84f
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/mesh/editmesh_bisect.c
View File

@@ -673,8 +673,7 @@ static void MESH_WGT_bisect(struct wmManipulatorGroupType *wgt)
wgt->name = "Mesh Bisect";
wgt->idname = "MESH_WGT_bisect";
wgt->flag = (WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
wgt->mmap_params.spaceid = SPACE_VIEW3D;
wgt->mmap_params.regionid = RGN_TYPE_WINDOW;

3
source/blender/editors/mesh/editmesh_extrude.c
View File

@@ -1147,8 +1147,7 @@ static void MESH_WGT_spin(struct wmManipulatorGroupType *wgt)
wgt->name = "Mesh Spin";
wgt->idname = "MESH_WGT_spin";
wgt->flag = (WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
wgt->mmap_params.spaceid = SPACE_VIEW3D;
wgt->mmap_params.regionid = RGN_TYPE_WINDOW;

9
source/blender/editors/space_view3d/view3d_manipulators.c
View File

@@ -113,8 +113,7 @@ void VIEW3D_WGT_lamp(wmManipulatorGroupType *wgt)
wgt->idname = "VIEW3D_WGT_lamp";
wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
WM_MANIPULATORGROUPTYPE_3D);
wgt->poll = WIDGETGROUP_lamp_poll;
wgt->setup = WIDGETGROUP_lamp_setup;
@@ -292,7 +291,8 @@ void VIEW3D_WGT_camera(wmManipulatorGroupType *wgt)
wgt->idname = "VIEW3D_WGT_camera";
wgt->flag = (WM_MANIPULATORGROUPTYPE_PERSISTENT |
WM_MANIPULATORGROUPTYPE_3D);
WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE);
wgt->poll = WIDGETGROUP_camera_poll;
wgt->setup = WIDGETGROUP_camera_setup;
@@ -360,7 +360,8 @@ void VIEW3D_WGT_force_field(wmManipulatorGroupType *wgt)
wgt->idname = "VIEW3D_WGT_force_field";
wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
WM_MANIPULATORGROUPTYPE_3D);
WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE);
wgt->poll = WIDGETGROUP_forcefield_poll;
wgt->setup = WIDGETGROUP_forcefield_setup;

3
source/blender/editors/transform/transform_manipulator.c
View File

@@ -1401,8 +1401,7 @@ void TRANSFORM_WGT_manipulator(wmManipulatorGroupType *wgt)
wgt->idname = "TRANSFORM_WGT_manipulator";
wgt->flag |= (WM_MANIPULATORGROUPTYPE_PERSISTENT |
WM_MANIPULATORGROUPTYPE_3D |
WM_MANIPULATORGROUPTYPE_SCALE_3D);
WM_MANIPULATORGROUPTYPE_3D);
wgt->poll = WIDGETGROUP_manipulator_poll;
wgt->setup = WIDGETGROUP_manipulator_setup;

5
source/blender/windowmanager/manipulators/WM_manipulator_types.h
View File

@@ -336,8 +336,9 @@ enum eManipulatorMapTypeUpdateFlags {
enum {
/* Mark manipulator-group as being 3D */
WM_MANIPULATORGROUPTYPE_3D = (1 << 0),
/* Scale manipulators as 3D object that respects zoom (otherwise zoom independent draw size) */
WM_MANIPULATORGROUPTYPE_SCALE_3D = (1 << 1),
/* Scale manipulators as 3D object that respects zoom (otherwise zoom independent draw size).
* note: currently only for 3D views, 2D support needs adding. */
WM_MANIPULATORGROUPTYPE_SCALE = (1 << 1),
/* Manipulators can be depth culled with scene objects (covered by other geometry - TODO) */
WM_MANIPULATORGROUPTYPE_DEPTH_3D = (1 << 2),
/* Manipulators can be selected */

2
source/blender/windowmanager/manipulators/intern/wm_manipulator.c
View File

@@ -446,7 +446,7 @@ void wm_manipulator_calculate_scale(wmManipulator *mpr, const bContext *C)
const RegionView3D *rv3d = CTX_wm_region_view3d(C);
float scale = U.ui_scale;
if (mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_SCALE_3D) {
if ((mpr->parent_mgroup->type->flag & WM_MANIPULATORGROUPTYPE_SCALE) == 0) {
scale *= U.manipulator_size;
if (rv3d) {
/* 'ED_view3d_pixel_size' includes 'U.pixelsize', remove it. */