diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 07:35:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 07:35:54 +0400 |
commit | 3fdc28b736fc6bbdfec9075b0fdd458897786a59 (patch) | |
tree | 352f1b1bae7a2deed796797c6c7e6263d8bd1f69 /source/blender/editors | |
parent | d15c5e51a1f05ff9044bda32cb8c47b6dd59426c (diff) |
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.
this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.
Diffstat (limited to 'source/blender/editors')
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 722e7057ece..fc6f0937c3d 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1142,7 +1142,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event) } else if(event==3) { /* size */ copy_v3_v3(base->object->size, ob->size); - copy_v3_v3(base->object->dsize, ob->dsize); + copy_v3_v3(base->object->dscale, ob->dscale); } else if(event==4) { /* drawtype */ base->object->dt= ob->dt; diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 0d2b35eec02..a83896e7280 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -188,15 +188,15 @@ static void object_clear_scale(Object *ob) { /* clear scale factors which are not locked */ if ((ob->protectflag & OB_LOCK_SCALEX)==0) { - ob->dsize[0]= 1.0f; + ob->dscale[0]= 1.0f; ob->size[0]= 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEY)==0) { - ob->dsize[1]= 1.0f; + ob->dscale[1]= 1.0f; ob->size[1]= 1.0f; } if ((ob->protectflag & OB_LOCK_SCALEZ)==0) { - ob->dsize[2]= 1.0f; + ob->dscale[2]= 1.0f; ob->size[2]= 1.0f; } } diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 8b8ae95631c..fcc285d52f0 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -130,7 +130,7 @@ typedef struct TransDataExtension { // float drotAngle; /* Initial object drotAngle, TODO: not yet implimented */ // float drotAxis[3]; /* Initial object drotAxis, TODO: not yet implimented */ float dquat[4]; /* Initial object dquat */ - float dsize[3]; /* Initial object dsize */ + float dscale[3]; /* Initial object dscale */ float *rot; /* Rotation of the data to transform (Faculative) */ float irot[3]; /* Initial rotation */ float *quat; /* Rotation quaternion of the data to transform (Faculative) */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index e19c115b194..5527ab0d331 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4314,7 +4314,7 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) td->ext->size = ob->size; copy_v3_v3(td->ext->isize, ob->size); - copy_v3_v3(td->ext->dsize, ob->dsize); + copy_v3_v3(td->ext->dscale, ob->dscale); copy_v3_v3(td->center, ob->obmat[3]); |