[Bf-blender-cvs] [0c69893bd61] soc-2019-npr: LANPR: Renamed freestyle edge mark constant into lanpr.
YimingWu
noreply at git.blender.org
Fri Jul 19 10:26:41 CEST 2019
Commit: 0c69893bd615d68ff592835d2258e90dad8f232e
Author: YimingWu
Date: Fri Jul 19 10:26:33 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB0c69893bd615d68ff592835d2258e90dad8f232e
LANPR: Renamed freestyle edge mark constant into lanpr.
===================================================================
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/lanpr/lanpr_ops.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_select_similar.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
M source/blender/makesdna/DNA_customdata_types.h
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/python/bmesh/bmesh_py_types_customdata.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 1fb29745dba..ac093588885 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1611,9 +1611,9 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
layerInterp_mvert_skin,
NULL,
layerDefault_mvert_skin},
- /* 37: CD_FREESTYLE_EDGE */
+ /* 37: CD_LANPR_EDGE */
{sizeof(FreestyleEdge), "FreestyleEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL},
- /* 38: CD_FREESTYLE_FACE */
+ /* 38: CD_LANPR_FACE */
{sizeof(FreestyleFace), "FreestyleFace", 1, NULL, NULL, NULL, NULL, NULL, NULL},
/* 39: CD_MLOOPTANGENT */
{sizeof(float[4]), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 2640683811f..1adae46990e 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -220,14 +220,14 @@ int BKE_object_data_transfer_dttype_to_cdtype(const int dtdata_type)
case DT_TYPE_BWEIGHT_EDGE:
return CD_FAKE_BWEIGHT;
case DT_TYPE_FREESTYLE_EDGE:
- return CD_FREESTYLE_EDGE;
+ return CD_LANPR_EDGE;
case DT_TYPE_UV:
return CD_FAKE_UV;
case DT_TYPE_SHARP_FACE:
return CD_FAKE_SHARP;
case DT_TYPE_FREESTYLE_FACE:
- return CD_FREESTYLE_FACE;
+ return CD_LANPR_FACE;
case DT_TYPE_VCOL:
return CD_MLOOPCOL;
@@ -517,10 +517,10 @@ static void data_transfer_layersmapping_add_item_cd(ListBase *r_map,
{
uint64_t data_flag = 0;
- if (cddata_type == CD_FREESTYLE_EDGE) {
+ if (cddata_type == CD_LANPR_EDGE) {
data_flag = FREESTYLE_EDGE_MARK;
}
- else if (cddata_type == CD_FREESTYLE_FACE) {
+ else if (cddata_type == CD_LANPR_FACE) {
data_flag = FREESTYLE_FACE_MARK;
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index b05728ccee1..d11778a8115 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -190,7 +190,7 @@ int lanpr_feed_atlas_data_obj(void *vedata,
}));
BM_mesh_elem_table_ensure(bm, BM_VERT | BM_EDGE | BM_FACE);
- if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
+ if (CustomData_has_layer(&bm->edata, CD_LANPR_EDGE)) {
CanFindFreestyle = 1;
}
@@ -222,7 +222,7 @@ int lanpr_feed_atlas_data_obj(void *vedata,
AtlasPointsR[idx + 3] = 1;
if (CanFindFreestyle) {
- fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
+ fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE);
if (fe->flag & FREESTYLE_EDGE_MARK) {
AtlasEdgeMask[idx + 1] = 1; /* channel G */
}
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index d677e6ac80d..8a1220d428f 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -719,8 +719,8 @@ static MeshRenderData *mesh_render_data_create_ex(Mesh *me,
rdata->cd.offset.crease = CustomData_get_offset(&bm->edata, CD_CREASE);
rdata->cd.offset.bweight = CustomData_get_offset(&bm->edata, CD_BWEIGHT);
- rdata->cd.offset.freestyle_edge = CustomData_get_offset(&bm->edata, CD_FREESTYLE_EDGE);
- rdata->cd.offset.freestyle_face = CustomData_get_offset(&bm->pdata, CD_FREESTYLE_FACE);
+ rdata->cd.offset.freestyle_edge = CustomData_get_offset(&bm->edata, CD_LANPR_EDGE);
+ rdata->cd.offset.freestyle_face = CustomData_get_offset(&bm->pdata, CD_LANPR_FACE);
}
if (types & (MR_DATATYPE_DVERT)) {
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index a76f1e1a4a1..9af0da209ff 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -1678,7 +1678,7 @@ static void lanpr_make_render_geometry_buffers_object(
BM_mesh_elem_table_ensure(bm, BM_VERT | BM_EDGE | BM_FACE);
BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE | BM_FACE);
- if (CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
+ if (CustomData_has_layer(&bm->edata, CD_LANPR_EDGE)) {
CanFindFreestyle = 1;
}
@@ -1716,7 +1716,7 @@ static void lanpr_make_render_geometry_buffers_object(
for (i = 0; i < bm->totedge; i++) {
e = BM_edge_at_index(bm, i);
if (CanFindFreestyle) {
- fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
+ fe = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE);
if (fe->flag & FREESTYLE_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 e1a20e03660..fb8b2c594a9 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -303,7 +303,7 @@ 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_FREESTYLE_EDGE);
+ FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE);
return (!fed) ? false : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false;
}
}
@@ -333,7 +333,7 @@ static void edgetag_set_cb(BMEdge *e, bool val, void *user_data_v)
break;
case EDGE_MODE_TAG_FREESTYLE: {
FreestyleEdge *fed;
- fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE);
+ fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_LANPR_EDGE);
if (!val) {
fed->flag &= ~FREESTYLE_EDGE_MARK;
}
@@ -357,8 +357,8 @@ static void edgetag_ensure_cd_flag(Mesh *me, const char edge_mode)
BM_mesh_cd_flag_ensure(bm, me, ME_CDFLAG_EDGE_BWEIGHT);
break;
case EDGE_MODE_TAG_FREESTYLE:
- if (!CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
- BM_data_layer_add(bm, &bm->edata, CD_FREESTYLE_EDGE);
+ if (!CustomData_has_layer(&bm->edata, CD_LANPR_EDGE)) {
+ BM_data_layer_add(bm, &bm->edata, CD_LANPR_EDGE);
}
break;
default:
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c
index 2782cc92aca..94b2981ff62 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -233,7 +233,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
break;
}
case SIMFACE_FREESTYLE: {
- if (!CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE)) {
+ if (!CustomData_has_layer(&bm->pdata, CD_LANPR_FACE)) {
face_data_value |= SIMFACE_DATA_FALSE;
continue;
}
@@ -298,7 +298,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
}
case SIMFACE_FREESTYLE: {
FreestyleFace *fface;
- fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_FREESTYLE_FACE);
+ fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE);
if ((fface == NULL) || ((fface->flag & FREESTYLE_FACE_MARK) == 0)) {
face_data_value |= SIMFACE_DATA_FALSE;
}
@@ -357,7 +357,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
break;
}
case SIMFACE_FREESTYLE: {
- has_custom_data_layer = CustomData_has_layer(&bm->pdata, CD_FREESTYLE_FACE);
+ has_custom_data_layer = CustomData_has_layer(&bm->pdata, CD_LANPR_FACE);
if ((face_data_value == SIMFACE_DATA_TRUE) && !has_custom_data_layer) {
continue;
}
@@ -467,7 +467,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op)
break;
}
- fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_FREESTYLE_FACE);
+ fface = CustomData_bmesh_get(&bm->pdata, face->head.data, CD_LANPR_FACE);
if (((fface != NULL) && (fface->flag & FREESTYLE_FACE_MARK)) ==
((face_data_value & SIMFACE_DATA_TRUE) != 0)) {
select = true;
@@ -687,7 +687,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op)
switch (type) {
case SIMEDGE_FREESTYLE: {
- if (!CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE)) {
+ if (!CustomData_has_layer(&bm->edata, CD_LANPR_EDGE)) {
edge_data_value |= SIMEDGE_DATA_FALSE;
continue;
}
@@ -746,7 +746,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op)
break;
case SIMEDGE_FREESTYLE: {
FreestyleEdge *fedge;
- fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_FREESTYLE_EDGE);
+ fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE);
if ((fedge == NULL) || ((fedge->flag & FREESTYLE_EDGE_MARK) == 0)) {
edge_data_value |= SIMEDGE_DATA_FALSE;
}
@@ -790,7 +790,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op)
bool has_custom_data_layer = false;
switch (type) {
case SIMEDGE_FREESTYLE: {
- has_custom_data_layer = CustomData_has_layer(&bm->edata, CD_FREESTYLE_EDGE);
+ has_custom_data_layer = CustomData_has_layer(&bm->edata, CD_LANPR_EDGE);
if ((edge_data_value == SIMEDGE_DATA_TRUE) && !has_custom_data_layer) {
continue;
}
@@ -885,7 +885,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op)
break;
}
- fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_FREESTYLE_EDGE);
+ fedge = CustomData_bmesh_get(&bm->edata, edge->head.data, CD_LANPR_EDGE);
if (((fedge != NULL) && (fedge->flag & FREESTYLE_EDGE
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list