griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: correct typo "hardeness" to "hardness" in DNA & variable names

Browse Source
This commit is contained in:
Campbell Barton
2023-09-25 12:05:50 +10:00
parent 7c614ff11d
commit caef976ceb
23 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/brush.cc
View File

@@ -738,7 +738,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 0.9f;
brush->gpencil_settings->hardness = 0.9f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_tool = GPAINT_TOOL_DRAW;
@@ -761,7 +761,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
@@ -796,7 +796,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag &= ~GP_BRUSH_GROUP_SETTINGS;
@@ -833,7 +833,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
@@ -870,7 +870,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = 0.3f;
brush->gpencil_settings->draw_angle = DEG2RAD(35.0f);
brush->gpencil_settings->draw_angle_factor = 0.5f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
@@ -912,7 +912,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
@@ -943,7 +943,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 0.8f;
brush->gpencil_settings->hardness = 0.8f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
@@ -977,7 +977,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
@@ -1004,7 +1004,7 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->fill_factor = 1.0f;
brush->gpencil_settings->draw_strength = 1.0f;
brush->gpencil_settings->hardeness = 1.0f;
brush->gpencil_settings->hardness = 1.0f;
copy_v2_fl(brush->gpencil_settings->aspect_ratio, 1.0f);
brush->gpencil_settings->draw_smoothfac = 0.1f;
brush->gpencil_settings->draw_smoothlvl = 1;

2
source/blender/blenkernel/intern/gpencil_curve_legacy.cc
View File

@@ -304,7 +304,7 @@ static void gpencil_convert_spline(Main *bmain,
bGPDstroke *gps = static_cast<bGPDstroke *>(MEM_callocN(sizeof(bGPDstroke), "bGPDstroke"));
gps->thickness = 1.0f;
gps->fill_opacity_fac = 1.0f;
gps->hardeness = 1.0f;
gps->hardness = 1.0f;
gps->uv_scale = 1.0f;
ARRAY_SET_ITEMS(gps->aspect_ratio, 1.0f, 1.0f);

4
source/blender/blenkernel/intern/gpencil_legacy.cc
View File

@@ -727,7 +727,7 @@ bGPDstroke *BKE_gpencil_stroke_new(int mat_idx, int totpoints, short thickness)
gps->thickness = thickness;
gps->fill_opacity_fac = 1.0f;
gps->hardeness = 1.0f;
gps->hardness = 1.0f;
copy_v2_fl(gps->aspect_ratio, 1.0f);
gps->uv_scale = 1.0f;
@@ -1013,7 +1013,7 @@ void BKE_gpencil_stroke_copy_settings(const bGPDstroke *gps_src, bGPDstroke *gps
gps_dst->inittime = gps_src->inittime;
gps_dst->mat_nr = gps_src->mat_nr;
copy_v2_v2_short(gps_dst->caps, gps_src->caps);
gps_dst->hardeness = gps_src->hardeness;
gps_dst->hardness = gps_src->hardness;
copy_v2_v2(gps_dst->aspect_ratio, gps_src->aspect_ratio);
gps_dst->fill_opacity_fac = gps_dst->fill_opacity_fac;
copy_v3_v3(gps_dst->boundbox_min, gps_src->boundbox_min);

2
source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
View File

@@ -101,7 +101,7 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf,
stroke_init_times.span[stroke_i] = float(gps->inittime);
stroke_start_caps.span[stroke_i] = int8_t(gps->caps[0]);
stroke_end_caps.span[stroke_i] = int8_t(gps->caps[1]);
stroke_hardnesses.span[stroke_i] = gps->hardeness;
stroke_hardnesses.span[stroke_i] = gps->hardness;
stroke_point_aspect_ratios.span[stroke_i] = gps->aspect_ratio[0] /
max_ff(gps->aspect_ratio[1], 1e-8);
stroke_fill_translations.span[stroke_i] = float2(gps->uv_translation);

8
source/blender/blenloader/intern/versioning_280.cc
View File

@@ -5036,23 +5036,23 @@ void blo_do_versions_280(FileData *fd, Library * /*lib*/, Main *bmain)
}
/* init grease pencil brush gradients */
if (!DNA_struct_member_exists(fd->filesdna, "BrushGpencilSettings", "float", "hardeness")) {
if (!DNA_struct_member_exists(fd->filesdna, "BrushGpencilSettings", "float", "hardness")) {
LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
if (brush->gpencil_settings != nullptr) {
BrushGpencilSettings *gp = brush->gpencil_settings;
gp->hardeness = 1.0f;
gp->hardness = 1.0f;
copy_v2_fl(gp->aspect_ratio, 1.0f);
}
}
}
/* init grease pencil stroke gradients */
if (!DNA_struct_member_exists(fd->filesdna, "bGPDstroke", "float", "hardeness")) {
if (!DNA_struct_member_exists(fd->filesdna, "bGPDstroke", "float", "hardness")) {
LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
gps->hardeness = 1.0f;
gps->hardness = 1.0f;
copy_v2_fl(gps->aspect_ratio, 1.0f);
}
}

4
source/blender/draw/engines/eevee/shaders/effect_dof_reduce_frag.glsl
View File

@@ -48,8 +48,8 @@ float dof_scatter_screen_border_rejection(float coc, vec2 uv, vec2 screen_size)
/* Full-resolution to half-resolution CoC. */
coc *= 0.5;
/* Allow 10px transition. */
const float rejection_hardeness = 1.0 / 10.0;
return saturate((min_screen_border_distance - abs(coc)) * rejection_hardeness + 1.0);
const float rejection_hardness = 1.0 / 10.0;
return saturate((min_screen_border_distance - abs(coc)) * rejection_hardness + 1.0);
}
float dof_scatter_luminosity_rejection(vec3 color)

4
source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_reduce_comp.glsl
View File

@@ -55,8 +55,8 @@ float dof_scatter_screen_border_rejection(float coc, ivec2 texel)
/* Full-resolution to half-resolution CoC. */
coc *= 0.5;
/* Allow 10px transition. */
const float rejection_hardeness = 1.0 / 10.0;
return saturate((min_screen_border_distance - abs(coc)) * rejection_hardeness + 1.0);
const float rejection_hardness = 1.0 / 10.0;
return saturate((min_screen_border_distance - abs(coc)) * rejection_hardness + 1.0);
}
float dof_scatter_luminosity_rejection(vec3 color)

4
source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc
View File

@@ -329,7 +329,7 @@ static void gpencil_buffer_add_point(GPUIndexBufBuilder *ibo,
float aspect_ratio = gps->aspect_ratio[0] / max_ff(gps->aspect_ratio[1], 1e-8);
vert->packed_asp_hard_rot = pack_rotation_aspect_hardness(
pt->uv_rot, aspect_ratio, gps->hardeness);
pt->uv_rot, aspect_ratio, gps->hardness);
if (!is_endpoint) {
/* Issue a Quad per point. */
@@ -567,7 +567,7 @@ bGPDstroke *DRW_cache_gpencil_sbuffer_stroke_data_get(Object *ob)
gps->mat_nr = max_ii(0, gpd->runtime.matid - 1);
gps->flag = gpd->runtime.sbuffer_sflag;
gps->thickness = brush->size;
gps->hardeness = brush->gpencil_settings->hardeness;
gps->hardness = brush->gpencil_settings->hardness;
copy_v2_v2(gps->aspect_ratio, brush->gpencil_settings->aspect_ratio);
/* Reduce slightly the opacity of fill to make easy fill areas while drawing. */

2
source/blender/editors/gpencil_legacy/annotate_paint.cc
View File

@@ -856,7 +856,7 @@ static void annotation_stroke_newfrombuffer(tGPsdata *p)
gps->totpoints = totelem;
gps->thickness = gpl->thickness;
gps->fill_opacity_fac = 1.0f;
gps->hardeness = 1.0f;
gps->hardness = 1.0f;
copy_v2_fl(gps->aspect_ratio, 1.0f);
gps->uv_scale = 1.0f;
gps->flag = gpd->runtime.sbuffer_sflag;

2
source/blender/editors/gpencil_legacy/gpencil_data.cc
View File

@@ -922,7 +922,7 @@ static bool gpencil_frame_is_equal(const bGPDframe *gpf_a, const bGPDframe *gpf_
if (gps_a->caps[1] != gps_b->caps[1]) {
return false;
}
if (gps_a->hardeness != gps_b->hardeness) {
if (gps_a->hardness != gps_b->hardness) {
return false;
}
if (!equals_v2v2(gps_a->aspect_ratio, gps_b->aspect_ratio)) {

2
source/blender/editors/gpencil_legacy/gpencil_fill.cc
View File

@@ -2172,7 +2172,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf)
bGPDstroke *gps = static_cast<bGPDstroke *>(MEM_callocN(sizeof(bGPDstroke), "bGPDstroke"));
gps->thickness = brush->size;
gps->fill_opacity_fac = 1.0f;
gps->hardeness = brush->gpencil_settings->hardeness;
gps->hardness = brush->gpencil_settings->hardness;
copy_v2_v2(gps->aspect_ratio, brush->gpencil_settings->aspect_ratio);
gps->inittime = 0.0f;

2
source/blender/editors/gpencil_legacy/gpencil_paint.cc
View File

@@ -1052,7 +1052,7 @@ static void gpencil_stroke_newfrombuffer(tGPsdata *p)
gps->totpoints = totelem;
gps->thickness = brush->size;
gps->fill_opacity_fac = 1.0f;
gps->hardeness = brush->gpencil_settings->hardeness;
gps->hardness = brush->gpencil_settings->hardness;
copy_v2_v2(gps->aspect_ratio, brush->gpencil_settings->aspect_ratio);
gps->flag = gpd->runtime.sbuffer_sflag;
gps->inittime = p->inittime;

4
source/blender/editors/gpencil_legacy/gpencil_primitive.cc
View File

@@ -322,7 +322,7 @@ static void gpencil_primitive_set_initdata(bContext *C, tGPDprimitive *tgpi)
bGPDstroke *gps = static_cast<bGPDstroke *>(MEM_callocN(sizeof(bGPDstroke), "Temp bGPDstroke"));
gps->thickness = 2.0f;
gps->fill_opacity_fac = 1.0f;
gps->hardeness = 1.0f;
gps->hardness = 1.0f;
copy_v2_fl(gps->aspect_ratio, 1.0f);
gps->uv_scale = 1.0f;
gps->inittime = 0.0f;
@@ -1349,7 +1349,7 @@ static void gpencil_primitive_interaction_end(bContext *C,
gps = static_cast<bGPDstroke *>(tgpi->gpf->strokes.first);
if (gps) {
gps->thickness = brush->size;
gps->hardeness = brush_settings->hardeness;
gps->hardness = brush_settings->hardness;
copy_v2_v2(gps->aspect_ratio, brush_settings->aspect_ratio);
/* Calc geometry data. */

2
source/blender/editors/space_view3d/view3d_gizmo_ruler.cc
View File

@@ -568,7 +568,7 @@ static bool view3d_ruler_to_gpencil(bContext *C, wmGizmoGroup *gzgroup)
}
gps->flag = GP_STROKE_3DSPACE;
gps->thickness = 3;
gps->hardeness = 1.0f;
gps->hardness = 1.0f;
gps->fill_opacity_fac = 1.0f;
copy_v2_fl(gps->aspect_ratio, 1.0f);
gps->uv_scale = 1.0f;

4
source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc
View File

@@ -100,8 +100,8 @@ static void deform_stroke(GpencilModifierData *md,
/* Hardness (at stroke level). */
if (mmd->modify_color == GP_MODIFY_COLOR_HARDNESS) {
gps->hardeness *= mmd->hardeness;
CLAMP(gps->hardeness, 0.0f, 1.0f);
gps->hardness *= mmd->hardness;
CLAMP(gps->hardness, 0.0f, 1.0f);
return;
}

2
source/blender/makesdna/DNA_brush_types.h
View File

@@ -90,7 +90,7 @@ typedef struct BrushGpencilSettings {
int flag;
/** gradient control along y for color */
float hardeness;
float hardness;
/** factor xy of shape for dots gradients */
float aspect_ratio[2];
/** Simplify adaptive factor */

2
source/blender/makesdna/DNA_gpencil_legacy_types.h
View File

@@ -290,7 +290,7 @@ typedef struct bGPDstroke {
short caps[2];
/** gradient control along y for color */
float hardeness;
float hardness;
/** factor xy of shape for dots gradients */
float aspect_ratio[2];

2
source/blender/makesdna/DNA_gpencil_modifier_defaults.h
View File

@@ -176,7 +176,7 @@
.factor = 1.0f, \
.modify_color = GP_MODIFY_COLOR_BOTH, \
.layer_pass = 0, \
.hardeness = 1.0f, \
.hardness = 1.0f, \
.curve_intensity = NULL, \
}

2
source/blender/makesdna/DNA_gpencil_modifier_types.h
View File

@@ -320,7 +320,7 @@ typedef struct OpacityGpencilModifierData {
/** Custom index for passes. */
int layer_pass;
float hardeness;
float hardness;
struct CurveMapping *curve_intensity;
} OpacityGpencilModifierData;

6
source/blender/makesdna/intern/dna_rename_defs.h
View File

@@ -52,7 +52,7 @@ DNA_STRUCT_RENAME_ELEM(Bone, scaleIn, scale_in_x)
DNA_STRUCT_RENAME_ELEM(Bone, scaleOut, scale_out_x)
DNA_STRUCT_RENAME_ELEM(Bone, scale_in_y, scale_in_z)
DNA_STRUCT_RENAME_ELEM(Bone, scale_out_y, scale_out_z)
DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_f, hardeness)
DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_f, hardness)
DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_s, aspect_ratio)
DNA_STRUCT_RENAME_ELEM(Camera, YF_dofdist, dof_distance)
DNA_STRUCT_RENAME_ELEM(Camera, clipend, clip_end)
@@ -143,6 +143,7 @@ DNA_STRUCT_RENAME_ELEM(Object, obmat, object_to_world)
DNA_STRUCT_RENAME_ELEM(Object, restrictflag, visibility_flag)
DNA_STRUCT_RENAME_ELEM(Object, size, scale)
DNA_STRUCT_RENAME_ELEM(Object_Runtime, crazyspace_num_verts, crazyspace_verts_num)
DNA_STRUCT_RENAME_ELEM(OpacityGpencilModifierData, hardeness, hardness)
DNA_STRUCT_RENAME_ELEM(ParticleSettings, child_nbr, child_percent)
DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_group, instance_collection)
DNA_STRUCT_RENAME_ELEM(ParticleSettings, dup_ob, instance_object)
@@ -173,7 +174,7 @@ DNA_STRUCT_RENAME_ELEM(View3D, near, clip_start)
DNA_STRUCT_RENAME_ELEM(View3D, ob_centre, ob_center)
DNA_STRUCT_RENAME_ELEM(View3D, ob_centre_bone, ob_center_bone)
DNA_STRUCT_RENAME_ELEM(View3D, ob_centre_cursor, ob_center_cursor)
DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_f, hardeness)
DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_f, hardness)
DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_s, aspect_ratio)
DNA_STRUCT_RENAME_ELEM(bNodeTree, inputs, inputs_legacy)
DNA_STRUCT_RENAME_ELEM(bNodeTree, outputs, outputs_legacy)
@@ -205,7 +206,6 @@ DNA_STRUCT_RENAME_ELEM(bTheme, ttopbar, space_topbar)
DNA_STRUCT_RENAME_ELEM(bTheme, tuserpref, space_preferences)
DNA_STRUCT_RENAME_ELEM(bTheme, tv3d, space_view3d)
DNA_STRUCT_RENAME_ELEM(bUserAssetLibrary, path, dirpath)
/* NOTE: Keep sorted! */
/* Write with a different name, old Blender versions crash loading files with non-NULL

2
source/blender/makesrna/intern/rna_brush.cc
View File

@@ -1647,7 +1647,7 @@ static void rna_def_gpencil_options(BlenderRNA *brna)
/* gradient control */
prop = RNA_def_property(srna, "hardness", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, nullptr, "hardeness");
RNA_def_property_float_sdna(prop, nullptr, "hardness");
RNA_def_property_range(prop, 0.001f, 1.0f);
RNA_def_property_float_default(prop, 1.0f);
RNA_def_property_ui_text(

2
source/blender/makesrna/intern/rna_gpencil_legacy.cc
View File

@@ -1700,7 +1700,7 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna)
/* gradient control along y */
prop = RNA_def_property(srna, "hardness", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, nullptr, "hardeness");
RNA_def_property_float_sdna(prop, nullptr, "hardness");
RNA_def_property_range(prop, 0.001f, 1.0f);
RNA_def_property_float_default(prop, 1.0f);
RNA_def_property_ui_text(prop, "Hardness", "Amount of gradient along section of stroke");

2
source/blender/makesrna/intern/rna_gpencil_legacy_modifier.cc
View File

@@ -2136,7 +2136,7 @@ static void rna_def_modifier_gpencilopacity(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
prop = RNA_def_property(srna, "hardness", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, nullptr, "hardeness");
RNA_def_property_float_sdna(prop, nullptr, "hardness");
RNA_def_property_range(prop, 0.0, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0, FLT_MAX, 0.1, 2);
RNA_def_property_ui_text(prop, "Hardness", "Factor of stroke hardness");