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

Cleanup: Fix warning of deprecated value in Paint struct

Browse Source 
Instead of using the deprecated tag, just add it to the name.
This commit is contained in:
Hans Goudey
2024-01-30 08:41:51 -05:00
parent 29df9e5e14
commit 35f949531f
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenloader/intern/versioning_400.cc
View File

@@ -2794,26 +2794,26 @@ void blo_do_versions_400(FileData *fd, Library * /*lib*/, Main *bmain)
ToolSettings *ts = scene->toolsettings;
int input_sample_values[10];
input_sample_values[0] = ts->imapaint.paint.num_input_samples;
input_sample_values[1] = ts->sculpt != nullptr ? ts->sculpt->paint.num_input_samples : 1;
input_sample_values[0] = ts->imapaint.paint.num_input_samples_deprecated;
input_sample_values[1] = ts->sculpt != nullptr ? ts->sculpt->paint.num_input_samples_deprecated : 1;
input_sample_values[2] = ts->curves_sculpt != nullptr ?
ts->curves_sculpt->paint.num_input_samples :
ts->curves_sculpt->paint.num_input_samples_deprecated :
1;
input_sample_values[3] = ts->uvsculpt != nullptr ? ts->uvsculpt->paint.num_input_samples : 1;
input_sample_values[3] = ts->uvsculpt != nullptr ? ts->uvsculpt->paint.num_input_samples_deprecated : 1;
input_sample_values[4] = ts->gp_paint != nullptr ? ts->gp_paint->paint.num_input_samples : 1;
input_sample_values[4] = ts->gp_paint != nullptr ? ts->gp_paint->paint.num_input_samples_deprecated : 1;
input_sample_values[5] = ts->gp_vertexpaint != nullptr ?
ts->gp_vertexpaint->paint.num_input_samples :
ts->gp_vertexpaint->paint.num_input_samples_deprecated :
1;
input_sample_values[6] = ts->gp_sculptpaint != nullptr ?
ts->gp_sculptpaint->paint.num_input_samples :
ts->gp_sculptpaint->paint.num_input_samples_deprecated :
1;
input_sample_values[7] = ts->gp_weightpaint != nullptr ?
ts->gp_weightpaint->paint.num_input_samples :
ts->gp_weightpaint->paint.num_input_samples_deprecated :
1;
input_sample_values[8] = ts->vpaint != nullptr ? ts->vpaint->paint.num_input_samples : 1;
input_sample_values[9] = ts->wpaint != nullptr ? ts->wpaint->paint.num_input_samples : 1;
input_sample_values[8] = ts->vpaint != nullptr ? ts->vpaint->paint.num_input_samples_deprecated : 1;
input_sample_values[9] = ts->wpaint != nullptr ? ts->wpaint->paint.num_input_samples_deprecated : 1;
int unified_value = 1;
for (int i = 0; i < 10; i++) {

7
source/blender/makesdna/DNA_scene_types.h
View File

@@ -968,11 +968,10 @@ typedef struct Paint {
int flags;
/**
* Paint stroke can use up to PAINT_MAX_INPUT_SAMPLES inputs to smooth the stroke.
* This value is now DEPRECATED, please refer to the Brush and UnifiedPaintSetting values
* instead.
* Paint stroke can use up to #PAINT_MAX_INPUT_SAMPLES inputs to smooth the stroke.
* This value is deprecated. Refer to the #Brush and #UnifiedPaintSetting values instead.
*/
int num_input_samples DNA_DEPRECATED;
int num_input_samples_deprecated;
/** Flags used for symmetry. */
int symmetry_flags;

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

@@ -154,6 +154,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(OpacityGpencilModifierData, hardeness, hardness)
DNA_STRUCT_RENAME_ELEM(Paint, num_input_samples, num_input_samples_deprecated)
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)