[Bf-blender-cvs] [f70b6c96c54] hair_guides: Clean up after exiting groom object edit mode.

Lukas Tönne noreply at git.blender.org
Thu Dec 21 12:18:16 CET 2017


Commit: f70b6c96c541fc7af952780bbd29d79c93dc420a
Author: Lukas Tönne
Date:   Thu Dec 21 11:17:59 2017 +0000
Branches: hair_guides
https://developer.blender.org/rBf70b6c96c541fc7af952780bbd29d79c93dc420a

Clean up after exiting groom object edit mode.

===================================================================

M	source/blender/editors/object/object_edit.c

===================================================================

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 02d08924d79..6222dbbf01b 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -216,6 +216,10 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
 		ED_mball_editmball_load(obedit);
 		if (freedata) ED_mball_editmball_free(obedit);
 	}
+	else if (obedit->type == OB_GROOM) {
+		ED_groom_editgroom_load(obedit);
+		if (freedata) ED_groom_editgroom_free(obedit);
+	}
 
 	/* Tag update so no access to freed data referenced from
 	 * derived cache will happen.



More information about the Bf-blender-cvs mailing list