Commit: 23cb7e81b0c1f8c8e3c05f72d11c2387443a0a40
Author: Lukas Tönne
Date: Thu May 24 07:06:32 2018 +0100
Branches: hair_guides hair_guides_grooming
https://developer.blender.org/rB23cb7e81b0c1f8c8e3c05f72d11c2387443a0a40
Remove unused 'Axes' mode for follicle drawing.
===================================================================
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_cache_impl.h
M source/blender/draw/intern/draw_cache_impl_hair.c
M source/blender/draw/intern/draw_hair.c
M source/blender/makesdna/DNA_hair_types.h
M source/blender/makesrna/intern/rna_hair.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache.c
b/source/blender/draw/intern/draw_cache.c
index daa6ecc9740..3659ba49743 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -2996,11 +2996,6 @@ Gwn_Batch *DRW_cache_hair_get_follicle_points(struct
HairSystem *hsys, struct De
return DRW_hair_batch_cache_get_follicle_points(hsys, scalp);
}
-Gwn_Batch *DRW_cache_hair_get_follicle_axes(struct HairSystem *hsys, struct
DerivedMesh *scalp)
-{
- return DRW_hair_batch_cache_get_follicle_axes(hsys, scalp);
-}
-
Gwn_Batch *DRW_cache_hair_get_guide_curve_points(struct HairSystem *hsys,
struct DerivedMesh *scalp, int subdiv)
{
return DRW_hair_batch_cache_get_guide_curve_points(hsys, scalp, subdiv);
diff --git a/source/blender/draw/intern/draw_cache.h
b/source/blender/draw/intern/draw_cache.h
index 2193ca89c21..dcec0bed151 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -180,7 +180,6 @@ struct Gwn_Batch *DRW_cache_particles_get_prim(int type);
struct Gwn_Batch *DRW_cache_hair_get_fibers(struct HairSystem *hsys, struct
DerivedMesh *scalp, int subdiv,
const struct
DRWHairFiberTextureBuffer **r_buffer);
struct Gwn_Batch *DRW_cache_hair_get_follicle_points(struct HairSystem *hsys,
struct DerivedMesh *scalp);
-struct Gwn_Batch *DRW_cache_hair_get_follicle_axes(struct HairSystem *hsys,
struct DerivedMesh *scalp);
struct Gwn_Batch *DRW_cache_hair_get_guide_curve_points(struct HairSystem
*hsys, struct DerivedMesh *scalp, int subdiv);
struct Gwn_Batch *DRW_cache_hair_get_guide_curve_edges(struct HairSystem
*hsys, struct DerivedMesh *scalp, int subdiv);
diff --git a/source/blender/draw/intern/draw_cache_impl.h
b/source/blender/draw/intern/draw_cache_impl.h
index 2a1ee0547be..8566c78a7d8 100644
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@ -140,7 +140,6 @@ struct Gwn_Batch
*DRW_particles_batch_cache_get_edit_tip_points(struct Object *o
struct Gwn_Batch *DRW_hair_batch_cache_get_fibers(struct HairSystem *hsys,
struct DerivedMesh *scalp, int subdiv,
const struct
DRWHairFiberTextureBuffer **r_buffer);
struct Gwn_Batch *DRW_hair_batch_cache_get_follicle_points(struct HairSystem
*hsys, struct DerivedMesh *scalp);
-struct Gwn_Batch *DRW_hair_batch_cache_get_follicle_axes(struct HairSystem
*hsys, struct DerivedMesh *scalp);
struct Gwn_Batch *DRW_hair_batch_cache_get_guide_curve_points(struct
HairSystem *hsys, struct DerivedMesh *scalp, int subdiv);
struct Gwn_Batch *DRW_hair_batch_cache_get_guide_curve_edges(struct HairSystem
*hsys, struct DerivedMesh *scalp, int subdiv);
diff --git a/source/blender/draw/intern/draw_cache_impl_hair.c
b/source/blender/draw/intern/draw_cache_impl_hair.c
index f722c93162b..531f8bf40b1 100644
--- a/source/blender/draw/intern/draw_cache_impl_hair.c
+++ b/source/blender/draw/intern/draw_cache_impl_hair.c
@@ -381,14 +381,6 @@ Gwn_Batch *DRW_hair_batch_cache_get_follicle_points(
}
-Gwn_Batch *DRW_hair_batch_cache_get_follicle_axes(
- HairSystem *hsys,
- struct DerivedMesh *scalp)
-{
- UNUSED_VARS(hsys, scalp);
- return NULL;
-}
-
Gwn_Batch *DRW_hair_batch_cache_get_guide_curve_points(
HairSystem *hsys,
struct DerivedMesh *scalp,
diff --git a/source/blender/draw/intern/draw_hair.c
b/source/blender/draw/intern/draw_hair.c
index 8f61c46479c..2408eaed535 100644
--- a/source/blender/draw/intern/draw_hair.c
+++ b/source/blender/draw/intern/draw_hair.c
@@ -79,9 +79,5 @@ void DRW_shgroup_hair(
DRW_shgroup_call_add(shgrp_verts, geom, ob->obmat);
break;
}
- case HAIR_DRAW_FOLLICLE_AXES:
- {
- break;
- }
}
}
diff --git a/source/blender/makesdna/DNA_hair_types.h
b/source/blender/makesdna/DNA_hair_types.h
index 26833792ab2..34e195b6d63 100644
--- a/source/blender/makesdna/DNA_hair_types.h
+++ b/source/blender/makesdna/DNA_hair_types.h
@@ -118,7 +118,6 @@ typedef enum eHairDrawFollicleMode
{
HAIR_DRAW_FOLLICLE_NONE = 0,
HAIR_DRAW_FOLLICLE_POINTS = 1,
- HAIR_DRAW_FOLLICLE_AXES = 2,
} eHairDrawFollicleMode;
#ifdef __cplusplus
diff --git a/source/blender/makesrna/intern/rna_hair.c
b/source/blender/makesrna/intern/rna_hair.c
index 126b1f3145b..5ac7224559d 100644
--- a/source/blender/makesrna/intern/rna_hair.c
+++ b/source/blender/makesrna/intern/rna_hair.c
@@ -206,7 +206,6 @@ static void rna_def_hair_draw_settings(BlenderRNA *brna)
static const EnumPropertyItem follicle_mode_items[] = {
{HAIR_DRAW_FOLLICLE_NONE, "NONE", 0, "None", ""},
{HAIR_DRAW_FOLLICLE_POINTS, "POINTS", 0, "Points", "Draw a point
for each follicle"},
- {HAIR_DRAW_FOLLICLE_AXES, "AXES", 0, "Axes", "Draw direction of
hair for each follicle"},
{0, NULL, 0, NULL, NULL}
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
