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:
authorJacques Lucke <mail@jlucke.com>2018-10-17 13:43:41 +0300
committerJacques Lucke <mail@jlucke.com>2018-10-17 13:43:41 +0300
commit21744217cea9bb8f767f47cb6c41446563e645ac (patch)
tree4cd38ca5ae9530eb99fcf91fa28530b42d0fce68 /source/blender/blenkernel/intern/customdata.c
parentc6eb5651ba26db3fa26179f2124c58f8c94b5ca3 (diff)
Cleanup: remove some #if 0 blocks
Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D3802
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
-rw-r--r--source/blender/blenkernel/intern/customdata.c34
1 files changed, 1 insertions, 33 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 8defb1307ce..765c42b39b0 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -471,11 +471,7 @@ static void layerInterp_origspace_face(
}
}
- /* delay writing to the destination incase dest is in sources */
-
-#if 0 /* no need, this ONLY contains UV's */
- *osf = *(OrigSpaceFace *)(*sources);
-#endif
+ /* delay writing to the destination in case dest is in sources */
memcpy(osf->uv, uv, sizeof(osf->uv));
}
@@ -3746,19 +3742,6 @@ void CustomData_external_remove(CustomData *data, ID *id, int type, int totelem)
CustomData_external_read(data, id, CD_TYPE_AS_MASK(layer->type), totelem);
layer->flag &= ~CD_FLAG_EXTERNAL;
-
-#if 0
- remove_file = 1;
- for (i = 0; i < data->totlayer; i++)
- if (data->layers[i].flag & CD_FLAG_EXTERNAL)
- remove_file = 0;
-
- if (remove_file) {
- customdata_external_filename(filename, id, external);
- cdf_remove(filename);
- CustomData_external_free(data);
- }
-#endif
}
}
@@ -3774,21 +3757,6 @@ bool CustomData_external_test(CustomData *data, int type)
return (layer->flag & CD_FLAG_EXTERNAL) != 0;
}
-#if 0
-void CustomData_external_remove_object(CustomData *data, ID *id)
-{
- CustomDataExternal *external = data->external;
- char filename[FILE_MAX];
-
- if (!external)
- return;
-
- customdata_external_filename(filename, id, external);
- cdf_remove(filename);
- CustomData_external_free(data);
-}
-#endif
-
/* ********** Mesh-to-mesh data transfer ********** */
static void copy_bit_flag(void *dst, const void *src, const size_t data_size, const uint64_t flag)
{