diff options
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.cc | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_nodes.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index f30e6a95787..82098aa1358 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -135,7 +135,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); CacheFile *cache_file = mcmd->cache_file; const float frame = DEG_get_ctime(ctx->depsgraph); - const double time = BKE_cachefile_time_offset(cache_file, (double)frame, FPS); + const double time = BKE_cachefile_time_offset(cache_file, double(frame), FPS); const char *err_str = nullptr; if (!mcmd->reader || !STREQ(mcmd->reader_object_path, mcmd->object_path)) { diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index a878793a34d..7c5bb988012 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -443,8 +443,8 @@ id_property_create_from_socket(const bNodeSocket &socket) auto property = bke::idprop::create(socket.identifier, value->value); IDPropertyUIDataFloat *ui_data = (IDPropertyUIDataFloat *)IDP_ui_data_ensure(property.get()); ui_data->base.rna_subtype = value->subtype; - ui_data->min = ui_data->soft_min = (double)value->min; - ui_data->max = ui_data->soft_max = (double)value->max; + ui_data->min = ui_data->soft_min = double(value->min); + ui_data->max = ui_data->soft_max = double(value->max); ui_data->default_value = value->value; return property; } @@ -466,8 +466,8 @@ id_property_create_from_socket(const bNodeSocket &socket) socket.identifier, Span<float>{value->value[0], value->value[1], value->value[2]}); IDPropertyUIDataFloat *ui_data = (IDPropertyUIDataFloat *)IDP_ui_data_ensure(property.get()); ui_data->base.rna_subtype = value->subtype; - ui_data->min = ui_data->soft_min = (double)value->min; - ui_data->max = ui_data->soft_max = (double)value->max; + ui_data->min = ui_data->soft_min = double(value->min); + ui_data->max = ui_data->soft_max = double(value->max); ui_data->default_array = (double *)MEM_mallocN(sizeof(double[3]), "mod_prop_default"); ui_data->default_array_len = 3; for (const int i : IndexRange(3)) { @@ -579,7 +579,7 @@ static void init_socket_cpp_value_from_property(const IDProperty &property, value = IDP_Float(&property); } else if (property.type == IDP_DOUBLE) { - value = (float)IDP_Double(&property); + value = float(IDP_Double(&property)); } new (r_value) ValueOrField<float>(value); break; |