[Bf-blender-cvs] [ff21f6a] master: Fix for own mistake in rB83f2012300acadafd359307e7a00bd71e67e3fd7: used bool instead of int.

[Lukas Tönne]

Commit: ff21f6aeef2cc878efa16e0c36c72214a1d0a5e8
Author: Lukas Tönne
Date:   Mon Mar 24 20:54:50 2014 +0100
https://developer.blender.org/rBff21f6aeef2cc878efa16e0c36c72214a1d0a5e8

Fix for own mistake in rB83f2012300acadafd359307e7a00bd71e67e3fd7: used
bool instead of int.

Thanks to Campbell Barton for noticing.

===================================================================

M	intern/cycles/blender/blender_object.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index ec53ebe..6ffc8c8 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -436,7 +436,7 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
 	 * 1 : eModifierMode_Realtime
 	 * 2 : eModifierMode_Render
 	 */
-	bool dupli_settings = preview ? 1 : 2;
+	int dupli_settings = preview ? 1 : 2;
 
 	bool cancel = false;