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

Cleanup: remove axis bounds ifdef

Browse Source 
This was added for scale-cage manipulator, but seems generally useful.
This commit is contained in:
Campbell Barton
2018-05-03 07:21:06 +02:00
parent 51aba69b89
commit 7840c593b8
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/include/ED_transform.h
View File

@@ -194,18 +194,13 @@ bool snapNodesTransform(
/* return args */ /* return args */
float r_loc[2], float *r_dist_px, char *r_node_border); float r_loc[2], float *r_dist_px, char *r_node_border);
#define USE_AXIS_BOUNDS
struct TransformBounds { struct TransformBounds {
float center[3]; /* Center for transform widget. */ float center[3]; /* Center for transform widget. */
float min[3], max[3]; /* Boundbox of selection for transform widget. */ float min[3], max[3]; /* Boundbox of selection for transform widget. */
#ifdef USE_AXIS_BOUNDS
/* Normalized axis */ /* Normalized axis */
float axis[3][3]; float axis[3][3];
float axis_min[3], axis_max[3]; float axis_min[3], axis_max[3];
#endif
}; };
int ED_transform_calc_manipulator_stats( int ED_transform_calc_manipulator_stats(

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

@@ -435,13 +435,11 @@ static void calc_tw_center(struct TransformBounds *tbounds, const float co[3])
minmax_v3v3_v3(tbounds->min, tbounds->max, co); minmax_v3v3_v3(tbounds->min, tbounds->max, co);
add_v3_v3(tbounds->center, co); add_v3_v3(tbounds->center, co);
#ifdef USE_AXIS_BOUNDS
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
const float d = dot_v3v3(tbounds->axis[i], co); const float d = dot_v3v3(tbounds->axis[i], co);
tbounds->axis_min[i] = min_ff(d, tbounds->axis_min[i]); tbounds->axis_min[i] = min_ff(d, tbounds->axis_min[i]);
tbounds->axis_max[i] = max_ff(d, tbounds->axis_max[i]); tbounds->axis_max[i] = max_ff(d, tbounds->axis_max[i]);
} }
#endif
} }
static void protectflag_to_drawflags(short protectflag, short *drawflags) static void protectflag_to_drawflags(short protectflag, short *drawflags)
@@ -609,11 +607,9 @@ int ED_transform_calc_manipulator_stats(
/* transform widget matrix */ /* transform widget matrix */
unit_m4(rv3d->twmat); unit_m4(rv3d->twmat);
#ifdef USE_AXIS_BOUNDS
unit_m3(rv3d->tw_axis_matrix); unit_m3(rv3d->tw_axis_matrix);
zero_v3(rv3d->tw_axis_min); zero_v3(rv3d->tw_axis_min);
zero_v3(rv3d->tw_axis_max); zero_v3(rv3d->tw_axis_max);
#endif
rv3d->twdrawflag = 0xFFFF; rv3d->twdrawflag = 0xFFFF;
@@ -693,7 +689,6 @@ int ED_transform_calc_manipulator_stats(
INIT_MINMAX(tbounds->min, tbounds->max); INIT_MINMAX(tbounds->min, tbounds->max);
zero_v3(tbounds->center); zero_v3(tbounds->center);
#ifdef USE_AXIS_BOUNDS
copy_m3_m4(tbounds->axis, rv3d->twmat); copy_m3_m4(tbounds->axis, rv3d->twmat);
if (ob && ob->mode & OB_MODE_EDIT) { if (ob && ob->mode & OB_MODE_EDIT) {
float diff_mat[3][3]; float diff_mat[3][3];
@@ -708,7 +703,6 @@ int ED_transform_calc_manipulator_stats(
tbounds->axis_min[i] = +FLT_MAX; tbounds->axis_min[i] = +FLT_MAX;
tbounds->axis_max[i] = -FLT_MAX; tbounds->axis_max[i] = -FLT_MAX;
} }
#endif
if (is_gp_edit) { if (is_gp_edit) {
float diff_mat[4][4]; float diff_mat[4][4];
@@ -1044,11 +1038,9 @@ int ED_transform_calc_manipulator_stats(
unit_m4(rv3d->twmat); unit_m4(rv3d->twmat);
} }
else { else {
#ifdef USE_AXIS_BOUNDS
copy_v3_v3(rv3d->tw_axis_min, tbounds->axis_min); copy_v3_v3(rv3d->tw_axis_min, tbounds->axis_min);
copy_v3_v3(rv3d->tw_axis_max, tbounds->axis_max); copy_v3_v3(rv3d->tw_axis_max, tbounds->axis_max);
copy_m3_m3(rv3d->tw_axis_matrix, tbounds->axis); copy_m3_m3(rv3d->tw_axis_matrix, tbounds->axis);
#endif
} }
return totsel; return totsel;