Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2021-08-26 11:36:04 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2021-08-26 11:36:04 +0300
commit1f2bf2fd73b048e866890a8c7bdfab53c9c0b1bd (patch)
tree7636c1c44c9ec6d16b7dfc16430c587f022884c5
parentfe7377809596c5a65e185afeefd500f7474c274b (diff)
Cleanup, quiet compile warnings
-rw-r--r--intern/cycles/blender/blender_object.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 41871582f66..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);