diff options
Diffstat (limited to 'source/blender/io/gpencil')
3 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc index bcf9a36c200..b9d7b6719b1 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_base.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc @@ -227,16 +227,16 @@ float2 GpencilIO::gpencil_3D_point_to_render_space(const float3 co) float2 r_co; mul_v2_project_m4_v3(&r_co.x, persmat_, &parent_co.x); - r_co.x = (r_co.x + 1.0f) / 2.0f * (float)render_x_; - r_co.y = (r_co.y + 1.0f) / 2.0f * (float)render_y_; + r_co.x = (r_co.x + 1.0f) / 2.0f * float(render_x_); + r_co.y = (r_co.y + 1.0f) / 2.0f * float(render_y_); /* Invert X axis. */ if (invert_axis_[0]) { - r_co.x = (float)render_x_ - r_co.x; + r_co.x = float(render_x_) - r_co.x; } /* Invert Y axis. */ if (invert_axis_[1]) { - r_co.y = (float)render_y_ - r_co.y; + r_co.y = float(render_y_) - r_co.y; } return r_co; @@ -244,7 +244,7 @@ float2 GpencilIO::gpencil_3D_point_to_render_space(const float3 co) float2 GpencilIO::gpencil_3D_point_to_2D(const float3 co) { - const bool is_camera = (bool)(rv3d_->persp == RV3D_CAMOB); + const bool is_camera = bool(rv3d_->persp == RV3D_CAMOB); if (is_camera) { return gpencil_3D_point_to_render_space(co); } @@ -292,9 +292,9 @@ void GpencilIO::prepare_stroke_export_colors(Object *ob, bGPDstroke *gps) avg_opacity_ += pt.strength; } - mul_v4_v4fl(avg_color, avg_color, 1.0f / (float)gps->totpoints); + mul_v4_v4fl(avg_color, avg_color, 1.0f / float(gps->totpoints)); interp_v3_v3v3(stroke_color_, stroke_color_, avg_color, avg_color[3]); - avg_opacity_ /= (float)gps->totpoints; + avg_opacity_ /= float(gps->totpoints); /* Fill color. */ copy_v4_v4(fill_color_, gp_style->fill_rgba); diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc index 6d4439243fd..f6d02d36a17 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc @@ -31,7 +31,7 @@ Object *GpencilImporter::create_object() const float *cur_loc = scene_->cursor.location; const float rot[3] = {0.0f}; ushort local_view_bits = (params_.v3d && params_.v3d->localvd) ? params_.v3d->local_view_uuid : - (ushort)0; + ushort(0); Object *ob_gpencil = ED_object_add_type(params_.C, OB_GPENCIL, diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc index ebad236bada..23c80900659 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc @@ -93,8 +93,8 @@ bool GpencilImporterSVG::read() /* Check frame. */ bGPDframe *gpf = BKE_gpencil_layer_frame_get(gpl, cfra_, GP_GETFRAME_ADD_NEW); /* Create materials. */ - bool is_stroke = (bool)shape->stroke.type; - bool is_fill = (bool)shape->fill.type; + bool is_stroke = bool(shape->stroke.type); + bool is_fill = bool(shape->fill.type); if ((!is_stroke) && (!is_fill)) { is_stroke = true; } @@ -148,11 +148,11 @@ void GpencilImporterSVG::create_stroke(bGPdata *gpd, const int32_t mat_index, const float matrix[4][4]) { - const bool is_stroke = (bool)shape->stroke.type; - const bool is_fill = (bool)shape->fill.type; + const bool is_stroke = bool(shape->stroke.type); + const bool is_fill = bool(shape->fill.type); const int edges = params_.resolution; - const float step = 1.0f / (float)(edges - 1); + const float step = 1.0f / float(edges - 1); const int totpoints = (path->npts / 3) * params_.resolution; @@ -221,10 +221,10 @@ static void unpack_nano_color(const uint pack, float r_col[4]) rgb_u[2] = ((pack) >> 16) & 0xFF; rgb_u[3] = ((pack) >> 24) & 0xFF; - r_col[0] = (float)rgb_u[0] / 255.0f; - r_col[1] = (float)rgb_u[1] / 255.0f; - r_col[2] = (float)rgb_u[2] / 255.0f; - r_col[3] = (float)rgb_u[3] / 255.0f; + r_col[0] = float(rgb_u[0]) / 255.0f; + r_col[1] = float(rgb_u[1]) / 255.0f; + r_col[2] = float(rgb_u[2]) / 255.0f; + r_col[3] = float(rgb_u[3]) / 255.0f; } void GpencilImporterSVG::convert_color(const int32_t color, float r_linear_rgba[4]) |