diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-05 13:56:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-05 14:06:01 +0300 |
| commit | d5bca524d55d929a9e725a51b373de4804e1fe2e (patch) | |
| tree | 887e7dff5e39259758bebb6b7728b5cf0a1d4f07 /source/blender/makesrna/intern/rna_sculpt_paint.c | |
| parent | 304ee9af8d57695664a1f1792c9e9278b5de6fec (diff) | |
Fix T44960: Crash with 'Shape Cut' in edit hair mode.
This is only supported for mesh objects so far.
Also, abort in case there are no faces in dm (instead of crashing on NULL BVH tree...).
Diffstat (limited to 'source/blender/makesrna/intern/rna_sculpt_paint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index d5e99d4f3e9..7b30aa84cfb 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -871,6 +871,7 @@ static void rna_def_particle_edit(BlenderRNA *brna) prop = RNA_def_property(srna, "shape_object", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Shape Object", "Outer shape to use for tools"); + RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Mesh_object_poll"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_ParticleEdit_redo"); /* brush */ |