diff options
author | YimingWu <xp8110@outlook.com> | 2019-08-09 04:56:08 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-08-09 04:56:08 +0300 |
commit | b6cc0d0e1c88106147143f7e80c8fffb063c64c1 (patch) | |
tree | aabc5522b8afd29b5c25eaf8114eb4fff6e12c00 /source/blender/editors | |
parent | b6fa99e21908dda402407c00ad22db87d67ac02b (diff) |
LANPR: Rename Freestyle face/edge mark structures into LANPR.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/UI_resources.h | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 4 | ||||
-rw-r--r-- | source/blender/editors/lanpr/lanpr_cpu.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_path.c | 10 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_select_similar.c | 16 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 12 |
6 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 3b080b6df95..1db584f0f59 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -250,8 +250,8 @@ typedef enum ThemeColorID { TH_UV_SHADOW, TH_UV_OTHERS, - TH_FREESTYLE_EDGE_MARK, - TH_FREESTYLE_FACE_MARK, + TH_LANPR_EDGE_MARK, + TH_LANPR_FACE_MARK, TH_MATCH, /* highlight color for search matches */ TH_SELECT_HIGHLIGHT, /* highlight color for selected outliner item */ diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index c31de60c7ed..1e74ee50dab 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -537,10 +537,10 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_HANDLE_SEL_ALIGN: cp = ts->handle_sel_align; break; - case TH_FREESTYLE_EDGE_MARK: + case TH_LANPR_EDGE_MARK: cp = ts->freestyle_edge_mark; break; - case TH_FREESTYLE_FACE_MARK: + case TH_LANPR_FACE_MARK: cp = ts->freestyle_face_mark; break; diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c index f2cc0be616e..419781f17e4 100644 --- a/source/blender/editors/lanpr/lanpr_cpu.c +++ b/source/blender/editors/lanpr/lanpr_cpu.c @@ -1584,7 +1584,7 @@ static void lanpr_make_render_geometry_buffers_object( LANPR_RenderVert *orv; LANPR_RenderLine *orl; LANPR_RenderTriangle *ort; - FreestyleEdge *fe; + LanprEdge *fe; int CanFindFreestyle = 0; int i; @@ -1661,7 +1661,7 @@ static void lanpr_make_render_geometry_buffers_object( e = BM_edge_at_index(bm, i); if (CanFindFreestyle) { fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); - if (fe->flag & FREESTYLE_EDGE_MARK) { + if (fe->flag & LANPR_EDGE_MARK) { rl->flags |= LANPR_EDGE_FLAG_EDGE_MARK; } } diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index 478fbec8ea6..3040ea44890 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -302,8 +302,8 @@ static bool edgetag_test_cb(BMEdge *e, void *user_data_v) case EDGE_MODE_TAG_BEVEL: return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? true : false; case EDGE_MODE_TAG_FREESTYLE: { - FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); - return (!fed) ? false : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false; + LanprEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); + return (!fed) ? false : (fed->flag & LANPR_EDGE_MARK) ? true : false; } } return 0; @@ -331,13 +331,13 @@ static void edgetag_set_cb(BMEdge *e, bool val, void *user_data_v) BM_elem_float_data_set(&bm->edata, e, CD_BWEIGHT, (val) ? 1.0f : 0.0f); break; case EDGE_MODE_TAG_FREESTYLE: { - FreestyleEdge *fed; + LanprEdge *fed; fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE); if (!val) { - fed->flag &= ~FREESTYLE_EDGE_MARK; + fed->flag &= ~LANPR_EDGE_MARK; } else { - fed->flag |= FREESTYLE_EDGE_MARK; + fed->flag |= LANPR_EDGE_MARK; } break; } diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index 94b2981ff62..02ec903dcdf 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -297,9 +297,9 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) break; } case SIMFACE_FREESTYLE: { - FreestyleFace *fface; + LanprFace *fface; fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE); - if ((fface == NULL) || ((fface->flag & FREESTYLE_FACE_MARK) == 0)) { + if ((fface == NULL) || ((fface->flag & LANPR_FACE_MARK) == 0)) { face_data_value |= SIMFACE_DATA_FALSE; } else { @@ -459,7 +459,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) } break; case SIMFACE_FREESTYLE: { - FreestyleFace *fface; + LanprFace *fface; if (!has_custom_data_layer) { BLI_assert(face_data_value == SIMFACE_DATA_FALSE); @@ -468,7 +468,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) } fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE); - if (((fface != NULL) && (fface->flag & FREESTYLE_FACE_MARK)) == + if (((fface != NULL) && (fface->flag & LANPR_FACE_MARK)) == ((face_data_value & SIMFACE_DATA_TRUE) != 0)) { select = true; } @@ -745,9 +745,9 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } break; case SIMEDGE_FREESTYLE: { - FreestyleEdge *fedge; + LanprEdge *fedge; fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE); - if ((fedge == NULL) || ((fedge->flag & FREESTYLE_EDGE_MARK) == 0)) { + if ((fedge == NULL) || ((fedge->flag & LANPR_EDGE_MARK) == 0)) { edge_data_value |= SIMEDGE_DATA_FALSE; } else { @@ -877,7 +877,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } break; case SIMEDGE_FREESTYLE: { - FreestyleEdge *fedge; + LanprEdge *fedge; if (!has_custom_data_layer) { BLI_assert(edge_data_value == SIMEDGE_DATA_FALSE); @@ -886,7 +886,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) } fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE); - if (((fedge != NULL) && (fedge->flag & FREESTYLE_EDGE_MARK)) == + if (((fedge != NULL) && (fedge->flag & LANPR_EDGE_MARK)) == ((edge_data_value & SIMEDGE_DATA_TRUE) != 0)) { select = true; } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 8d15d956e5c..8566c9d0fea 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7427,7 +7427,7 @@ static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) { BMEdge *eed; BMIter iter; - FreestyleEdge *fed; + LanprEdge *fed; const bool clear = RNA_boolean_get(op->ptr, "clear"); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -7456,7 +7456,7 @@ static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_LANPR_EDGE); - fed->flag &= ~FREESTYLE_EDGE_MARK; + fed->flag &= ~LANPR_EDGE_MARK; } } } @@ -7464,7 +7464,7 @@ static int edbm_mark_lanpr_edge_exec(bContext *C, wmOperator *op) BM_ITER_MESH (eed, &iter, em->bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(eed, BM_ELEM_SELECT) && !BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) { fed = CustomData_bmesh_get(&em->bm->edata, eed->head.data, CD_LANPR_EDGE); - fed->flag |= FREESTYLE_EDGE_MARK; + fed->flag |= LANPR_EDGE_MARK; } } } @@ -7507,7 +7507,7 @@ static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) { BMFace *efa; BMIter iter; - FreestyleFace *ffa; + LanprFace *ffa; const bool clear = RNA_boolean_get(op->ptr, "clear"); ViewLayer *view_layer = CTX_data_view_layer(C); @@ -7534,7 +7534,7 @@ static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_LANPR_FACE); - ffa->flag &= ~FREESTYLE_FACE_MARK; + ffa->flag &= ~LANPR_FACE_MARK; } } } @@ -7542,7 +7542,7 @@ static int edbm_mark_lanpr_face_exec(bContext *C, wmOperator *op) BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { if (BM_elem_flag_test(efa, BM_ELEM_SELECT) && !BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) { ffa = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_LANPR_FACE); - ffa->flag |= FREESTYLE_FACE_MARK; + ffa->flag |= LANPR_FACE_MARK; } } } |