[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58302] branches/soc-2013-cycles_mblur/ intern/cycles/blender: Reverted previous commit.

[Gavin Howard]

Revision: 58302
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58302
Author:   gdh
Date:     2013-07-16 01:31:08 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Reverted previous commit. It seems that the int motion is more deeply 
embedded than I thought. I will have to look at this more closely.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-16 00:40:12 UTC (rev 58301)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-16 01:31:08 UTC (rev 58302)
@@ -415,7 +415,7 @@
 
 /* Object Loop */
 
-void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, bool motion)
+void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
 {
 	/* layer data */
 	uint scene_layer = render_layer.scene_layer;

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h	2013-07-16 00:40:12 UTC (rev 58301)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h	2013-07-16 01:31:08 UTC (rev 58302)
@@ -73,8 +73,9 @@
 	/* sync */
 	void sync_lamps(bool update_all);
 	void sync_materials(bool update_all);
-	void sync_objects(BL::SpaceView3D b_v3d, bool motion = false);
+	void sync_objects(BL::SpaceView3D b_v3d, int motion = 0);
 	void sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override);
+	void sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override);
 	void sync_film();
 	void sync_view();
 	void sync_world(bool update_all);