diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 23:46:04 +0300 |
| commit | 8dff53898965b5ea07a99245071098207d3f197e (patch) | |
| tree | 6d15750b7009796ac7176bb3063145e2dc12b66b /source/blender/makesrna/intern/rna_sculpt_paint.c | |
| parent | 45fdf41be87fb0b2fbf85778a714537ed1f5eca3 (diff) | |
| parent | 0e2915b2929aa312a03bc4d3a606bb8073fcead0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_sculpt_paint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 6f3a1afc156..5b2a3c9c4f4 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -223,13 +223,13 @@ static const EnumPropertyItem *rna_ParticleEdit_tool_itemf(bContext *C, PointerR return particle_edit_cache_brush_items; } -static int rna_ParticleEdit_editable_get(PointerRNA *ptr) +static bool rna_ParticleEdit_editable_get(PointerRNA *ptr) { ParticleEditSettings *pset = (ParticleEditSettings *)ptr->data; return (pset->object && pset->scene && PE_get_current(pset->scene, pset->object)); } -static int rna_ParticleEdit_hair_get(PointerRNA *ptr) +static bool rna_ParticleEdit_hair_get(PointerRNA *ptr) { ParticleEditSettings *pset = (ParticleEditSettings *)ptr->data; |