[Bf-blender-cvs] [6bbaa9e] hair_system: Removed unused "drawdata" buffer pointer from hair DNA, drawing code uses OpenGL buffers instead.

Lukas Tönne noreply at git.blender.org
Wed Aug 13 15:43:28 CEST 2014


Commit: 6bbaa9e1a121cbb5e2c345c90425a496e4875845
Author: Lukas Tönne
Date:   Wed Aug 13 11:30:12 2014 +0200
Branches: hair_system
https://developer.blender.org/rB6bbaa9e1a121cbb5e2c345c90425a496e4875845

Removed unused "drawdata" buffer pointer from hair DNA, drawing code
uses OpenGL buffers instead.

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

M	source/blender/blenkernel/intern/hair.c
M	source/blender/makesdna/DNA_hair_types.h

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

diff --git a/source/blender/blenkernel/intern/hair.c b/source/blender/blenkernel/intern/hair.c
index 7b337f3..4e14d8b 100644
--- a/source/blender/blenkernel/intern/hair.c
+++ b/source/blender/blenkernel/intern/hair.c
@@ -70,9 +70,6 @@ void BKE_hairsys_free(HairSystem *hsys)
 		MEM_freeN(hsys->curves);
 	}
 	
-	if (hsys->display.drawdata)
-		MEM_freeN(hsys->display.drawdata);
-	
 	MEM_freeN(hsys);
 }
 
@@ -85,8 +82,6 @@ HairSystem *BKE_hairsys_copy(HairSystem *hsys)
 	for (i = 0; i < totcurves; ++i)
 		thsys->curves[i].points = MEM_dupallocN(hsys->curves[i].points);
 	
-	thsys->display.drawdata = NULL;
-	
 	return thsys;
 }
 
diff --git a/source/blender/makesdna/DNA_hair_types.h b/source/blender/makesdna/DNA_hair_types.h
index 169c3ee..90270f6 100644
--- a/source/blender/makesdna/DNA_hair_types.h
+++ b/source/blender/makesdna/DNA_hair_types.h
@@ -81,8 +81,6 @@ typedef struct HairParams {
 typedef struct HairDisplaySettings {
 	int mode;
 	int pad;
-	
-	struct HairDrawData *drawdata;  /* draw data cache */
 } HairDisplaySettings;
 
 typedef enum eHairDisplay_Mode {




More information about the Bf-blender-cvs mailing list