[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36474] trunk/blender/source/blender/ makesrna/intern: rna object constraint remove function wasn' t calling ED_object_constraint_update().

Campbell Barton ideasman42 at gmail.com
Wed May 4 07:56:26 CEST 2011


Revision: 36474
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36474
Author:   campbellbarton
Date:     2011-05-04 05:56:26 +0000 (Wed, 04 May 2011)
Log Message:
-----------
rna object constraint remove function wasn't calling ED_object_constraint_update().

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_pose.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-05-04 05:52:14 UTC (rev 36473)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-05-04 05:56:26 UTC (rev 36474)
@@ -1096,8 +1096,9 @@
 	}
 
 	remove_constraint(&object->constraints, con);
+	ED_object_constraint_update(object);
 	ED_object_constraint_set_active(object, NULL);
-	WM_main_add_notifier(NC_OBJECT|ND_CONSTRAINT, object);
+	WM_main_add_notifier(NC_OBJECT|ND_CONSTRAINT|NA_REMOVED, object);
 }
 
 static ModifierData *rna_Object_modifier_new(Object *object, bContext *C, ReportList *reports, const char *name, int type)

Modified: trunk/blender/source/blender/makesrna/intern/rna_pose.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_pose.c	2011-05-04 05:52:14 UTC (rev 36473)
+++ trunk/blender/source/blender/makesrna/intern/rna_pose.c	2011-05-04 05:56:26 UTC (rev 36474)
@@ -475,16 +475,13 @@
 		const short is_ik= ELEM(con->type, CONSTRAINT_TYPE_KINEMATIC, CONSTRAINT_TYPE_SPLINEIK);
 
 		remove_constraint(&pchan->constraints, con);
-
 		ED_object_constraint_update(ob);
-
 		constraints_set_active(&pchan->constraints, NULL);
+		WM_main_add_notifier(NC_OBJECT|ND_CONSTRAINT|NA_REMOVED, id);
 
 		if (is_ik) {
 			BIK_clear_data(ob->pose);
 		}
-
-		WM_main_add_notifier(NC_OBJECT|ND_CONSTRAINT|NA_REMOVED, id);
 	}
 }
 




More information about the Bf-blender-cvs mailing list