diff options
Diffstat (limited to 'intern/cycles/blender/blender_object.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index a7eae421b55..5d98b61b409 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -376,7 +376,7 @@ static bool lookup_property(BL::ID b_id, const string &name, float4 *r_value) if (type == PROP_FLOAT) value = RNA_property_float_get(&ptr, prop); else if (type == PROP_INT) - value = RNA_property_int_get(&ptr, prop); + value = static_cast<float>(RNA_property_int_get(&ptr, prop)); else return false; @@ -504,14 +504,14 @@ void BlenderSync::sync_procedural(BL::Object &b_ob, procedural_map.used(procedural); } - float current_frame = b_scene.frame_current(); + float current_frame = static_cast<float>(b_scene.frame_current()); if (cache_file.override_frame()) { current_frame = cache_file.frame(); } if (!cache_file.override_frame()) { - procedural->set_start_frame(b_scene.frame_start()); - procedural->set_end_frame(b_scene.frame_end()); + procedural->set_start_frame(static_cast<float>(b_scene.frame_start())); + procedural->set_end_frame(static_cast<float>(b_scene.frame_end())); } procedural->set_frame(current_frame); @@ -547,6 +547,7 @@ void BlenderSync::sync_procedural(BL::Object &b_ob, #else (void)b_ob; (void)b_mesh_cache; + (void)has_subdivision_modifier; #endif } |