Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/engines/lanpr/lanpr_dpix.c8
-rw-r--r--source/blender/draw/intern/draw_common.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 7ebb28d2b2e..dd136b5f378 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -186,7 +186,7 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata),
struct BMVert *v1, *v2;
struct BMEdge *e;
struct BMLoop *l1, *l2;
- LanprEdge *fe;
+ FreestyleEdge *fe;
int CanFindFreestyle = 0;
int edge_count = me->totedge;
int i, idx;
@@ -210,7 +210,7 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata),
}));
BM_mesh_elem_table_ensure(bm, BM_VERT | BM_EDGE | BM_FACE);
- if (CustomData_has_layer(&bm->edata, CD_LANPR_EDGE)) {
+ if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
CanFindFreestyle = 1;
}
@@ -242,8 +242,8 @@ int lanpr_feed_atlas_data_obj(void *UNUSED(vedata),
AtlasPointsR[idx + 3] = 1;
if (CanFindFreestyle) {
- fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE);
- if (fe->flag & LANPR_EDGE_MARK) {
+ fe = CustomData_bmesh_get(&bm->edata, e->head.data, FREESTYLE_EDGE_MARK);
+ if (fe->flag & FREESTYLE_EDGE_MARK) {
AtlasEdgeMask[idx + 1] = 1; /* channel G */
}
}
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index d6e5da9307e..8e0f713add6 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -97,8 +97,8 @@ void DRW_globals_update(void)
interp_v4_v4v4(gb->colorDupli, gb->colorBackground, gb->colorWire, 0.3f);
#ifdef WITH_FREESTYLE
- UI_GetThemeColor4fv(TH_LANPR_EDGE_MARK, gb->colorEdgeFreestyle);
- UI_GetThemeColor4fv(TH_LANPR_FACE_MARK, gb->colorFaceFreestyle);
+ UI_GetThemeColor4fv(TH_FREESTYLE_EDGE_MARK, gb->colorEdgeFreestyle);
+ UI_GetThemeColor4fv(TH_FREESTYLE_FACE_MARK, gb->colorFaceFreestyle);
#else
zero_v4(gb->colorEdgeFreestyle);
zero_v4(gb->colorFaceFreestyle);