diff options
author | YimingWu <xp8110@outlook.com> | 2019-09-12 12:09:50 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-09-12 12:09:50 +0300 |
commit | a2cb7ffa66691f4a210ab9f19ea22c2b614f2e7a (patch) | |
tree | 88317e271e648f5ba729a25b9642c84fee0efccb /source/blender/blenkernel/intern/data_transfer.c | |
parent | af0378aa4aacd0c9fdf9cc3523947b0ce34eea42 (diff) |
LANPR: Apply cleanup branch result.temp-lanpr-staging
Diffstat (limited to 'source/blender/blenkernel/intern/data_transfer.c')
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 3dc025bdcf2..0414c6d0a02 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -222,14 +222,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_LANPR_EDGE; + return CD_FREESTYLE_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_LANPR_FACE; + return CD_FREESTYLE_FACE; case DT_TYPE_VCOL: return CD_MLOOPCOL; @@ -519,11 +519,11 @@ static void data_transfer_layersmapping_add_item_cd(ListBase *r_map, { uint64_t data_flag = 0; - if (cddata_type == CD_LANPR_EDGE) { - data_flag = LANPR_EDGE_MARK; + if (cddata_type == CD_FREESTYLE_EDGE) { + data_flag = FREESTYLE_EDGE_MARK; } - else if (cddata_type == CD_LANPR_FACE) { - data_flag = LANPR_FACE_MARK; + else if (cddata_type == CD_FREESTYLE_FACE) { + data_flag = FREESTYLE_FACE_MARK; } data_transfer_layersmapping_add_item(r_map, |