diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-24 23:54:50 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-24 23:54:50 +0400 |
| commit | ff21f6aeef2cc878efa16e0c36c72214a1d0a5e8 (patch) | |
| tree | 3769cd079518294e390331ef24199c8d5eb7299e /intern/cycles/blender/blender_object.cpp | |
| parent | e9a64e27706721105530f82307e36cc45930531d (diff) | |
Fix for own mistake in rB83f2012300acadafd359307e7a00bd71e67e3fd7: used
bool instead of int.
Thanks to Campbell Barton for noticing.
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |