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

Fix T83090: Multiple warnings accessing brush enum data.

Browse Source 
We already have generic enums for empty and default 'none' value.
This commit is contained in:
Bastien Montagne
2020-12-02 09:29:37 +01:00
parent da22ec1254
commit 2afc508eb4
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/makesrna/intern/rna_brush.c
View File

@@ -786,10 +786,6 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C,
{
ePaintMode mode = BKE_paintmode_get_active_from_context(C);
static const EnumPropertyItem prop_default_items[] = {
{0, NULL, 0, NULL, NULL},
};
/* sculpt mode */
static const EnumPropertyItem prop_flatten_contrast_items[] = {
{BRUSH_DIR_IN, "CONTRAST", ICON_ADD, "Contrast", "Subtract effect of brush"},
@@ -849,10 +845,10 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C,
return prop_direction_items;
case BRUSH_MASK_SMOOTH:
return prop_default_items;
return DummyRNA_DEFAULT_items;
default:
return prop_default_items;
return DummyRNA_DEFAULT_items;
}
case SCULPT_TOOL_FLATTEN:
@@ -871,7 +867,7 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C,
return prop_inflate_deflate_items;
default:
return prop_default_items;
return DummyRNA_DEFAULT_items;
}
case PAINT_MODE_TEXTURE_2D:
@@ -881,11 +877,11 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C,
return prop_soften_sharpen_items;
default:
return prop_default_items;
return DummyRNA_DEFAULT_items;
}
default:
return prop_default_items;
return DummyRNA_DEFAULT_items;
}
}