[Bf-blender-cvs] [614868b5714] hair_guides: Generic modifier copy already deletes target data, explicit freeing is redundant.

Lukas Tönne noreply at git.blender.org
Fri Jun 29 14:33:06 CEST 2018


Commit: 614868b5714ba05303e2581bd24d54dc4b2f8c97
Author: Lukas Tönne
Date:   Fri Jun 29 13:32:34 2018 +0100
Branches: hair_guides
https://developer.blender.org/rB614868b5714ba05303e2581bd24d54dc4b2f8c97

Generic modifier copy already deletes target data, explicit freeing is redundant.

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

M	source/blender/modifiers/intern/MOD_hair.c

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

diff --git a/source/blender/modifiers/intern/MOD_hair.c b/source/blender/modifiers/intern/MOD_hair.c
index 45bc3d91020..dc4e2bf6c90 100644
--- a/source/blender/modifiers/intern/MOD_hair.c
+++ b/source/blender/modifiers/intern/MOD_hair.c
@@ -68,14 +68,6 @@ static void copyData(const ModifierData *md, ModifierData *target)
 	const HairModifierData *hmd = (HairModifierData *) md;
 	HairModifierData *tfmd = (HairModifierData *) target;
 
-	if (tfmd->hair_system) {
-		BKE_hair_free(tfmd->hair_system);
-	}
-	if (tfmd->draw_settings)
-	{
-		BKE_hair_draw_settings_free(tfmd->draw_settings);
-	}
-
 	modifier_copyData_generic(md, target);
 	
 	if (hmd->hair_system) {



More information about the Bf-blender-cvs mailing list