[Bf-blender-cvs] [0451043045b] master: Fix flag on wrong object being modified
Sergey Sharybin
noreply at git.blender.org
Fri Mar 1 10:03:18 CET 2019
Commit: 0451043045bb2c9a0194546a5d528dfc832b3c8b
Author: Sergey Sharybin
Date: Fri Mar 1 10:00:14 2019 +0100
Branches: master
https://developer.blender.org/rB0451043045bb2c9a0194546a5d528dfc832b3c8b
Fix flag on wrong object being modified
The intention was to disable constraints prior evaluation of
the object.
Spotted by Campbell, thanks!
===================================================================
M source/blender/editors/transform/transform_conversions.c
===================================================================
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 9895e654564..4c23806c0aa 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -5815,9 +5815,9 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob)
* object matrix via td->ob->obmat. */
Object *object_eval = DEG_get_evaluated_object(t->depsgraph, ob);
if (skip_invert == false && constinv == false) {
- ob->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc checks this */
+ object_eval->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc checks this */
BKE_object_where_is_calc(t->depsgraph, t->scene, object_eval);
- ob->transflag &= ~OB_NO_CONSTRAINTS;
+ object_eval->transflag &= ~OB_NO_CONSTRAINTS;
}
else {
BKE_object_where_is_calc(t->depsgraph, t->scene, object_eval);
More information about the Bf-blender-cvs
mailing list