[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54604] trunk/blender/source/blender/ blenkernel: code cleanup: missed r54603, arg reordering.

[Campbell Barton]

Revision: 54604
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54604
Author:   campbellbarton
Date:     2013-02-17 04:35:50 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
code cleanup: missed r54603, arg reordering.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54603

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_object.h
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/blenkernel/intern/scene.c

Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h	2013-02-17 03:57:20 UTC (rev 54603)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h	2013-02-17 04:35:50 UTC (rev 54604)
@@ -150,7 +150,8 @@
                                       const short protectflag);
 
 void BKE_object_handle_update(struct Scene *scene, struct Object *ob);
-void BKE_object_handle_update_ex(struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob);
+void BKE_object_handle_update_ex(struct Scene *scene, struct Object *ob,
+                                 struct RigidBodyWorld *rbw);
 void BKE_object_sculpt_modifiers_changed(struct Object *ob);
 
 int BKE_object_obdata_texspace_get(struct Object *ob, short **r_texflag, float **r_loc, float **r_size, float **r_rot);

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2013-02-17 03:57:20 UTC (rev 54603)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2013-02-17 04:35:50 UTC (rev 54604)
@@ -2631,7 +2631,8 @@
 /* the main object update call, for object matrix, constraints, keys and displist (modifiers) */
 /* requires flags to be set! */
 /* Ideally we shouldn't have to pass the rigid body world, but need bigger restructuring to avoid id */
-void BKE_object_handle_update_ex(Scene *scene, RigidBodyWorld *rbw, Object *ob)
+void BKE_object_handle_update_ex(Scene *scene, Object *ob,
+                                 RigidBodyWorld *rbw)
 {
 	if (ob->recalc & OB_RECALC_ALL) {
 		/* speed optimization for animation lookups */
@@ -2833,7 +2834,7 @@
  */
 void BKE_object_handle_update(Scene *scene, Object *ob)
 {
-	BKE_object_handle_update_ex(scene, NULL, ob);
+	BKE_object_handle_update_ex(scene, ob, NULL);
 }
 
 void BKE_object_sculpt_modifiers_changed(Object *ob)

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2013-02-17 03:57:20 UTC (rev 54603)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2013-02-17 04:35:50 UTC (rev 54604)
@@ -1125,7 +1125,7 @@
 	for (base = scene->base.first; base; base = base->next) {
 		Object *ob = base->object;
 		
-		BKE_object_handle_update_ex(scene_parent, scene->rigidbody_world, ob);
+		BKE_object_handle_update_ex(scene_parent, ob, scene->rigidbody_world);
 		
 		if (ob->dup_group && (ob->transflag & OB_DUPLIGROUP))
 			group_handle_recalc_and_update(scene_parent, ob, ob->dup_group);