Commit: a2715716ba1c247fe5aafdb471c34230c8f61ff8
Author: Lukas Tönne
Date: Sun Sep 23 12:58:55 2018 +0100
Branches: hair_object
https://developer.blender.org/rBa2715716ba1c247fe5aafdb471c34230c8f61ff8
Remove deprecated texture cache from HairSystem.
===================================================================
M source/blender/blenkernel/intern/hair.c
M source/blender/blenkernel/intern/hair_draw.c
M source/blender/blenloader/intern/readfile.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 2cc646bd6df..bb4cea70b2f 100644
--- a/source/blender/blenkernel/intern/hair.c
+++ b/source/blender/blenkernel/intern/hair.c
@@ -166,7 +166,6 @@ void BKE_hair_copy_data(Main *UNUSED(bmain), HairSystem
*hsys_dst, const HairSys
}
hsys_dst->draw_batch_cache = NULL;
- hsys_dst->draw_texture_cache = NULL;
}
HairSystem *BKE_hair_copy(Main *bmain, const HairSystem *hsys)
diff --git a/source/blender/blenkernel/intern/hair_draw.c
b/source/blender/blenkernel/intern/hair_draw.c
index 12a02c3399e..b62ce6888b1 100644
--- a/source/blender/blenkernel/intern/hair_draw.c
+++ b/source/blender/blenkernel/intern/hair_draw.c
@@ -84,7 +84,7 @@ void BKE_hair_batch_cache_dirty(HairSystem* hsys, int mode)
void BKE_hair_batch_cache_free(HairSystem* hsys)
{
- if (hsys->draw_batch_cache || hsys->draw_texture_cache) {
+ if (hsys->draw_batch_cache) {
BKE_hair_batch_cache_free_cb(hsys);
}
}
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index e584cf0e470..00384e507ef 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8410,7 +8410,6 @@ static void direct_link_hair(FileData *fd, HairSystem*
hsys)
hsys->bb = NULL;
hsys->edithair = NULL;
hsys->draw_batch_cache = NULL;
- hsys->draw_texture_cache = NULL;
}
/* ************** GENERAL & MAIN ******************** */
diff --git a/source/blender/makesdna/DNA_hair_types.h
b/source/blender/makesdna/DNA_hair_types.h
index 547b256ed55..096d532ca31 100644
--- a/source/blender/makesdna/DNA_hair_types.h
+++ b/source/blender/makesdna/DNA_hair_types.h
@@ -118,8 +118,6 @@ typedef struct HairSystem {
/* Data buffers for drawing */
void *draw_batch_cache;
- /* Texture buffer for drawing */
- void *draw_texture_cache;
} HairSystem;
typedef enum eHairSystemFlag
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
