diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 07:43:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-18 07:43:55 +0300 |
commit | cc10d8653575e0d299b330521c98027f1dc8da36 (patch) | |
tree | e48d07b85d634119b9b1c52fe8dc480949eba7ba /source/blender/editors | |
parent | 4719e7ec7a9c3095117bd2b0b08aeb1d72c62d98 (diff) |
DNA: rename Object.size -> scale
Resolves a common cause of confusion.
Diffstat (limited to 'source/blender/editors')
9 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 68ebdf7fa23..b36929f66b0 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -714,7 +714,7 @@ static void gp_draw_stroke_3d(tGPDdraw *tgpw, short thickness, const float ink[4 immBindBuiltinProgram(GPU_SHADER_GPENCIL_STROKE); immUniform2fv("Viewport", viewport); immUniform1f("pixsize", tgpw->rv3d->pixsize); - float obj_scale = tgpw->ob ? (tgpw->ob->size[0] + tgpw->ob->size[1] + tgpw->ob->size[2]) / 3.0f : 1.0f; + float obj_scale = tgpw->ob ? (tgpw->ob->scale[0] + tgpw->ob->scale[1] + tgpw->ob->scale[2]) / 3.0f : 1.0f; immUniform1f("objscale", obj_scale); int keep_size = (int)((tgpw->gpd) && (tgpw->gpd->flag & GP_DATA_STROKE_KEEPTHICKNESS)); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 2f1ae2a1c39..e9aaaccb3d2 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -440,7 +440,7 @@ static int object_add_exec(bContext *C, wmOperator *op) if (ob->type == OB_LATTICE) { /* lattice is a special case! * we never want to scale the obdata since that is the rest-state */ - copy_v3_fl(ob->size, radius); + copy_v3_fl(ob->scale, radius); } else { BKE_object_obdata_size_init(ob, radius); diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 31c9a428f3c..00374c12473 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -222,15 +222,15 @@ static void object_clear_scale(Object *ob, const bool clear_delta) { /* clear scale factors which are not locked */ if ((ob->protectflag & OB_LOCK_SCALEX) == 0) { - ob->size[0] = 1.0f; + ob->scale[0] = 1.0f; if (clear_delta) ob->dscale[0] = 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEY) == 0) { - ob->size[1] = 1.0f; + ob->scale[1] = 1.0f; if (clear_delta) ob->dscale[1] = 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEZ) == 0) { - ob->size[2] = 1.0f; + ob->scale[2] = 1.0f; if (clear_delta) ob->dscale[2] = 1.0f; } } @@ -630,7 +630,7 @@ static int apply_objects_internal( continue; if (apply_scale) - BKE_tracking_reconstruction_scale(&clip->tracking, ob->size); + BKE_tracking_reconstruction_scale(&clip->tracking, ob->scale); } else if (ob->type == OB_EMPTY) { /* It's possible for empties too, even though they don't @@ -649,7 +649,7 @@ static int apply_objects_internal( (apply_rot == false) && (apply_scale == true)) { - float max_scale = max_fff(fabsf(ob->size[0]), fabsf(ob->size[1]), fabsf(ob->size[2])); + float max_scale = max_fff(fabsf(ob->scale[0]), fabsf(ob->scale[1]), fabsf(ob->scale[2])); ob->empty_drawsize *= max_scale; } } @@ -680,7 +680,7 @@ static int apply_objects_internal( if (apply_loc) zero_v3(ob->loc); if (apply_scale) - ob->size[0] = ob->size[1] = ob->size[2] = 1.0f; + ob->scale[0] = ob->scale[1] = ob->scale[2] = 1.0f; if (apply_rot) { zero_v3(ob->rot); unit_qt(ob->quat); @@ -1402,10 +1402,10 @@ static void object_apply_rotation(Object *ob, const float rmat[3][3]) float rmat4[4][4]; copy_m4_m3(rmat4, rmat); - copy_v3_v3(size, ob->size); + copy_v3_v3(size, ob->scale); copy_v3_v3(loc, ob->loc); BKE_object_apply_mat4(ob, rmat4, true, true); - copy_v3_v3(ob->size, size); + copy_v3_v3(ob->scale, size); copy_v3_v3(ob->loc, loc); } /* We may want to extract this to: BKE_object_apply_location */ diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 91b5cfc0e9d..9192d1c2fe9 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -438,7 +438,7 @@ static void fluid_init_all_channels(bContext *C, Object *UNUSED(fsDomain), Fluid set_channel(fobj->Translation, timeAtFrame, ob->loc, i, CHANNEL_VEC); set_channel(fobj->Rotation, timeAtFrame, rot_d, i, CHANNEL_VEC); - set_channel(fobj->Scale, timeAtFrame, ob->size, i, CHANNEL_VEC); + set_channel(fobj->Scale, timeAtFrame, ob->scale, i, CHANNEL_VEC); set_channel(fobj->Active, timeAtFrame, &active, i, CHANNEL_FLOAT); set_channel(fobj->InitialVelocity, timeAtFrame, &fluidmd->fss->iniVelx, i, CHANNEL_VEC); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 725179869f6..d3506b44770 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4412,12 +4412,12 @@ static void sculpt_update_cache_invariants( else { max_scale = 0.0f; for (i = 0; i < 3; i ++) { - max_scale = max_ff(max_scale, fabsf(ob->size[i])); + max_scale = max_ff(max_scale, fabsf(ob->scale[i])); } } - cache->scale[0] = max_scale / ob->size[0]; - cache->scale[1] = max_scale / ob->size[1]; - cache->scale[2] = max_scale / ob->size[2]; + cache->scale[0] = max_scale / ob->scale[0]; + cache->scale[1] = max_scale / ob->scale[1]; + cache->scale[2] = max_scale / ob->scale[2]; cache->plane_trim_squared = brush->plane_trim * brush->plane_trim; @@ -5881,7 +5881,7 @@ void ED_object_sculptmode_enter_ex( BKE_sculpt_mask_layers_ensure(ob, mmd); } - if (!(fabsf(ob->size[0] - ob->size[1]) < 1e-4f && fabsf(ob->size[1] - ob->size[2]) < 1e-4f)) { + if (!(fabsf(ob->scale[0] - ob->scale[1]) < 1e-4f && fabsf(ob->scale[1] - ob->scale[2]) < 1e-4f)) { BKE_report(reports, RPT_WARNING, "Object has non-uniform scale, sculpting may be unpredictable"); } diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index 4ad63a6c6b4..2df74240241 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -670,18 +670,18 @@ static int do_set_scale(bContext *C, } else { if (tracking_object->flag & TRACKING_OBJECT_CAMERA) { - mul_v3_fl(object->size, scale); + mul_v3_fl(object->scale, scale); mul_v3_fl(object->loc, scale); } else if (!scale_solution) { Object *solver_camera = object_solver_camera(scene, object); - object->size[0] = object->size[1] = object->size[2] = 1.0f / scale; + object->scale[0] = object->scale[1] = object->scale[2] = 1.0f / scale; if (solver_camera) { - object->size[0] /= solver_camera->size[0]; - object->size[1] /= solver_camera->size[1]; - object->size[2] /= solver_camera->size[2]; + object->scale[0] /= solver_camera->scale[0]; + object->scale[1] /= solver_camera->scale[1]; + object->scale[2] /= solver_camera->scale[2]; } } else { diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index 33c2da00f97..d1ff73d1f87 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -251,21 +251,21 @@ void ED_view3d_cameracontrol_update( } else { float view_mat[4][4]; - float size_mat[4][4]; - float size_back[3]; + float scale_mat[4][4]; + float scale_back[3]; - /* even though we handle the size matrix, this still changes over time */ - copy_v3_v3(size_back, v3d->camera->size); + /* even though we handle the scale matrix, this still changes over time */ + copy_v3_v3(scale_back, v3d->camera->scale); ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); - size_to_mat4(size_mat, v3d->camera->size); - mul_m4_m4m4(view_mat, view_mat, size_mat); + size_to_mat4(scale_mat, v3d->camera->scale); + mul_m4_m4m4(view_mat, view_mat, scale_mat); BKE_object_apply_mat4(v3d->camera, view_mat, true, true); DEG_id_tag_update(&v3d->camera->id, ID_RECALC_TRANSFORM); - copy_v3_v3(v3d->camera->size, size_back); + copy_v3_v3(v3d->camera->scale, scale_back); id_key = &v3d->camera->id; } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 311a233ae9f..2d871e8d646 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -174,7 +174,7 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmGizmoGroup *gzgroup) /* account for lens shifting */ - offset[0] = ((ob->size[0] > 0.0f) ? -2.0f : 2.0f) * ca->shiftx; + offset[0] = ((ob->scale[0] > 0.0f) ? -2.0f : 2.0f) * ca->shiftx; offset[1] = 2.0f * ca->shifty; offset[2] = 0.0f; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 5f896ef448a..3d8ccc4680e 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5826,8 +5826,8 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) } td->ext->rotOrder = ob->rotmode; - td->ext->size = ob->size; - copy_v3_v3(td->ext->isize, ob->size); + td->ext->size = ob->scale; + copy_v3_v3(td->ext->isize, ob->scale); copy_v3_v3(td->ext->dscale, ob->dscale); copy_v3_v3(td->center, ob->obmat[3]); |