diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/blenkernel/intern/data_transfer.c | |
parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/data_transfer.c')
-rw-r--r-- | source/blender/blenkernel/intern/data_transfer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 00b8063110d..e20c6a35303 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -107,7 +107,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity( } switch (dtdata_type) { - /* Vertex data */ + /* Vertex data */ case DT_TYPE_MDEFORMVERT: *r_advanced_mixing = true; *r_threshold = true; @@ -120,7 +120,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity( case DT_TYPE_BWEIGHT_VERT: ret = true; break; - /* Edge data */ + /* Edge data */ case DT_TYPE_SHARP_EDGE: *r_threshold = true; ret = true; @@ -139,7 +139,7 @@ bool BKE_object_data_transfer_get_dttypes_capacity( *r_threshold = true; ret = true; break; - /* Loop/Poly data */ + /* Loop/Poly data */ case DT_TYPE_UV: ret = true; break; |