Popup for setting hair distribution operator properties.

2 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/groom.c b/source/blender/blenkernel/intern/groom.c
index d2542fa89de..eae4724f047 100644
--- a/source/blender/blenkernel/intern/groom.c
+++ b/source/blender/blenkernel/intern/groom.c
@@ -499,6 +499,10 @@ void BKE_groom_distribute_follicles(Groom *groom, unsigned int seed, int count)
 {
 	BLI_assert(groom->scalp_object);
 	DerivedMesh *scalp = object_get_derived_final(groom->scalp_object, false);
+	if (!scalp)
+	{
+		return;
+	}
 	
 	BKE_hair_generate_follicles(groom->hair_system, scalp, seed, count);
 }
diff --git a/source/blender/editors/groom/groom_hair.c b/source/blender/editors/groom/groom_hair.c
index 503a8b9daef..22664361639 100644
--- a/source/blender/editors/groom/groom_hair.c
+++ b/source/blender/editors/groom/groom_hair.c
@@ -97,6 +97,7 @@ void GROOM_OT_hair_distribute(wmOperatorType *ot)
 	ot->idname = "GROOM_OT_hair_distribute";
 
 	/* api callbacks */
+	ot->invoke = WM_operator_props_popup_confirm;
 	ot->exec = hair_distribute_exec;
 	ot->poll = groom_object_poll;