From ff21f6aeef2cc878efa16e0c36c72214a1d0a5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Mon, 24 Mar 2014 20:54:50 +0100 Subject: Fix for own mistake in rB83f2012300acadafd359307e7a00bd71e67e3fd7: used bool instead of int. Thanks to Campbell Barton for noticing. --- intern/cycles/blender/blender_object.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/blender/blender_object.cpp') diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index ec53ebe520b..6ffc8c81ce6 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; -- cgit v1.2.3