Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-06 16:07:23 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-06 16:10:04 +0300
commit92094c76a949fb9ad9f85ea09aa1f518b402a916 (patch)
tree25ceb40034df4564c6c54f2ac30ebcb6329ce648 /source/blender/makesrna/intern/rna_sculpt_paint.c
parentebcea3029d8ffa893431620947caf7e16e6fb8e9 (diff)
DNA: remove none particle brush & deprecated flags
The none brush doesn't make sense to have anymore with the tool system. Also remove deprecated flags & types for object, armature & text.
Diffstat (limited to 'source/blender/makesrna/intern/rna_sculpt_paint.c')
-rw-r--r--source/blender/makesrna/intern/rna_sculpt_paint.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index c8722005927..61746f388fa 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -48,7 +48,6 @@
#include "bmesh.h"
const EnumPropertyItem rna_enum_particle_edit_hair_brush_items[] = {
- {PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush"},
{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb hairs"},
{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth hairs"},
{PE_BRUSH_ADD, "ADD", 0, "Add", "Add hairs"},
@@ -136,7 +135,6 @@ static void rna_GPencil_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UN
}
const EnumPropertyItem rna_enum_particle_edit_disconnected_hair_brush_items[] = {
- {PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush"},
{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb hairs"},
{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth hairs"},
{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make hairs longer or shorter"},
@@ -146,7 +144,6 @@ const EnumPropertyItem rna_enum_particle_edit_disconnected_hair_brush_items[] =
};
static const EnumPropertyItem particle_edit_cache_brush_items[] = {
- {PE_BRUSH_NONE, "NONE", 0, "None", "Don't use any brush"},
{PE_BRUSH_COMB, "COMB", 0, "Comb", "Comb paths"},
{PE_BRUSH_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth paths"},
{PE_BRUSH_LENGTH, "LENGTH", 0, "Length", "Make paths longer or shorter"},
@@ -158,8 +155,7 @@ static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr)
ParticleEditSettings *pset = (ParticleEditSettings *)ptr->data;
ParticleBrushData *brush = NULL;
- if (pset->brushtype != PE_BRUSH_NONE)
- brush = &pset->brush[pset->brushtype];
+ brush = &pset->brush[pset->brushtype];
return rna_pointer_inherit_refine(ptr, &RNA_ParticleBrush, brush);
}