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:
authorCampbell Barton <ideasman42@gmail.com>2019-04-30 06:41:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-30 06:41:21 +0300
commit5d7ee02b17f2afad574609be3450eb8e5c0f18d2 (patch)
treef649e4603a382b2e96701bf2aacaeb62a5967604 /source/blender/collada/ImageExporter.cpp
parentd9fb06f87694a45dc6656a32b72b85ba8ade3a34 (diff)
Cleanup: comments (long lines) in collada
Diffstat (limited to 'source/blender/collada/ImageExporter.cpp')
-rw-r--r--source/blender/collada/ImageExporter.cpp37
1 files changed, 19 insertions, 18 deletions
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp
index 1a5c42aee52..650e1bfcd57 100644
--- a/source/blender/collada/ImageExporter.cpp
+++ b/source/blender/collada/ImageExporter.cpp
@@ -75,27 +75,27 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
char export_dir[FILE_MAX];
char export_file[FILE_MAX];
- // Destination folder for exported assets
+ /* Destination folder for exported assets */
BLI_split_dir_part(this->export_settings->filepath, export_dir, sizeof(export_dir));
if (is_generated || is_dirty || use_copies || is_packed) {
- // make absolute destination path
+ /* make absolute destination path */
BLI_strncpy(export_file, name.c_str(), sizeof(export_file));
BKE_image_path_ensure_ext_from_imformat(export_file, &imageFormat);
BLI_join_dirfile(export_path, sizeof(export_path), export_dir, export_file);
- // make dest directory if it doesn't exist
+ /* make dest directory if it doesn't exist */
BLI_make_existing_file(export_path);
}
if (is_generated || is_dirty || is_packed) {
- // This image in its current state only exists in Blender memory.
- // So we have to export it. The export will keep the image state intact,
- // so the exported file will not be associated with the image.
+ /* This image in its current state only exists in Blender memory.
+ * So we have to export it. The export will keep the image state intact,
+ * so the exported file will not be associated with the image. */
if (BKE_imbuf_write_as(imbuf, export_path, &imageFormat, true) == 0) {
fprintf(stderr, "Collada export: Cannot export image to:\n%s\n", export_path);
@@ -105,18 +105,18 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
}
else {
- // make absolute source path
+ /* make absolute source path */
BLI_strncpy(source_path, image->name, sizeof(source_path));
BLI_path_abs(source_path, BKE_main_blendfile_path_from_global());
BLI_cleanup_path(NULL, source_path);
if (use_copies) {
- // This image is already located on the file system.
- // But we want to create copies here.
- // To move images into the same export directory.
- // Note: If an image is already located in the export folder,
- // then skip the copy (as it would result in a file copy error).
+ /* This image is already located on the file system.
+ * But we want to create copies here.
+ * To move images into the same export directory.
+ * Note: If an image is already located in the export folder,
+ * then skip the copy (as it would result in a file copy error). */
if (BLI_path_cmp(source_path, export_path) != 0) {
if (BLI_copy(source_path, export_path) != 0) {
@@ -132,17 +132,18 @@ void ImagesExporter::export_UV_Image(Image *image, bool use_copies)
}
else {
- // Do not make any copies, but use the source path directly as reference
- // to the original image
+ /* Do not make any copies, but use the source path directly as reference
+ * to the original image */
BLI_strncpy(export_path, source_path, sizeof(export_path));
}
}
- COLLADASW::Image img(
- COLLADABU::URI(COLLADABU::URI::nativePathToUri(export_path)),
- translated_name,
- translated_name); /* set name also to mNameNC. This helps other viewers import files exported from Blender better */
+ /* Set name also to mNameNC.
+ * This helps other viewers import files exported from Blender better. */
+ COLLADASW::Image img(COLLADABU::URI(COLLADABU::URI::nativePathToUri(export_path)),
+ translated_name,
+ translated_name);
img.add(mSW);
fprintf(stdout, "Collada export: Added image: %s\n", export_file);