diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-09-06 13:00:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-06 13:04:09 +0300 |
commit | 39f3474cf138c8245c0cb6faa314971dd465c6e7 (patch) | |
tree | 6f3aad6db3a7b1d2ee1a73e6478c0ba37df48fe1 /source/blender/blenkernel/BKE_object.h | |
parent | e858d21ae42386c57c7f5b4b0982642173f460e5 (diff) |
Fix T69536: Setting dimensions for parented objects fails
Parenting/constraints/delta-scaled all caused setting dimensions to fail.
Take the difference between the input scale and final scale into
account when applying the dimensions.
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
-rw-r--r-- | source/blender/blenkernel/BKE_object.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index cf4bce3a209..5162e1cf51d 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -222,7 +222,13 @@ void BKE_boundbox_minmax(const struct BoundBox *bb, struct BoundBox *BKE_object_boundbox_get(struct Object *ob); void BKE_object_dimensions_get(struct Object *ob, float vec[3]); +void BKE_object_dimensions_set_ex(struct Object *ob, + const float value[3], + int axis_mask, + const float ob_scale_orig[3], + const float ob_obmat_orig[4][4]); void BKE_object_dimensions_set(struct Object *ob, const float value[3], int axis_mask); + void BKE_object_empty_draw_type_set(struct Object *ob, const int value); void BKE_object_boundbox_flag(struct Object *ob, int flag, const bool set); void BKE_object_boundbox_calc_from_mesh(struct Object *ob, struct Mesh *me_eval); |