Commit: ba399ca5c954ebda8aa66d4eb9219851de9fa1f4
Author: Sergey Sharybin
Date: Thu Feb 12 12:05:57 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBba399ca5c954ebda8aa66d4eb9219851de9fa1f4
Merge branch 'master' into depsgraph_refactor
Conflicts:
source/blender/editors/object/object_constraint.c
===================================================================
===================================================================
diff --cc source/blender/editors/object/object_constraint.c
index 432da3b,97d9267..4aa5b45
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@@ -1182,23 -1182,13 +1182,16 @@@ static int constraint_delete_exec(bCont
Object *ob = ptr.id.data;
bConstraint *con = ptr.data;
ListBase *lb = get_constraint_lb(ob, con, NULL);
- const bool is_ik = ELEM(con->type, CONSTRAINT_TYPE_KINEMATIC,
CONSTRAINT_TYPE_SPLINEIK);
/* free the constraint */
- if (BKE_constraint_remove(lb, con)) {
+ if (BKE_constraint_remove_ex(lb, ob, con, true)) {
/* there's no active constraint now, so make sure this is the
case */
- BKE_constraints_active_set(lb, NULL);
-
+ BKE_constraints_active_set(&ob->constraints, NULL);
ED_object_constraint_update(ob); /* needed to set the flags on
posebones correctly */
--
- /* ITASC needs to be rebuilt once a constraint is removed
[#26920] */
- if (is_ik) {
- BIK_clear_data(ob->pose);
- }
+
+ /* relatiols */
+ DAG_relations_tag_update(CTX_data_main(C));
+
/* notifiers */
WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT |
NA_REMOVED, ob);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
