diff --git a/intern/cycles/blender/curves.cpp b/intern/cycles/blender/curves.cpp index fd7e05062e6..1ac2e250ee5 100644 --- a/intern/cycles/blender/curves.cpp +++ b/intern/cycles/blender/curves.cpp @@ -386,7 +386,7 @@ static void ExportCurveSegments(Scene *scene, Hair *hair, ParticleCurveData *CDa /* check allocation */ if ((hair->get_curve_keys().size() != num_keys) || (hair->num_curves() != num_curves)) { - LOG_WARNING << "Hair memory allocation failed, clearing data."; + LOG_ERROR << "Hair memory allocation failed, clearing data."; hair->clear(true); } } diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp index 050fca03158..6d0cc72d277 100644 --- a/intern/cycles/device/cuda/device_impl.cpp +++ b/intern/cycles/device/cuda/device_impl.cpp @@ -339,13 +339,13 @@ string CUDADevice::compile_kernel(const string &common_cflags, const int nvcc_cuda_version = cuewCompilerVersion(); LOG_INFO << "Found nvcc " << nvcc << ", CUDA version " << nvcc_cuda_version << "."; if (nvcc_cuda_version < 101) { - LOG_WARNING << "Unsupported CUDA version " << nvcc_cuda_version / 10 << "." - << nvcc_cuda_version % 10 << ", you need CUDA 10.1 or newer"; + LOG_ERROR << "Unsupported CUDA version " << nvcc_cuda_version / 10 << "." + << nvcc_cuda_version % 10 << ", you need CUDA 10.1 or newer"; return string(); } if (!(nvcc_cuda_version >= 102 && nvcc_cuda_version < 130)) { - LOG_WARNING << "CUDA version " << nvcc_cuda_version / 10 << "." << nvcc_cuda_version % 10 - << "CUDA 10.1 to 12 are officially supported."; + LOG_ERROR << "CUDA version " << nvcc_cuda_version / 10 << "." << nvcc_cuda_version % 10 + << "CUDA 10.1 to 12 are officially supported."; } double starttime = time_dt(); diff --git a/intern/cycles/hydra/field.cpp b/intern/cycles/hydra/field.cpp index 0367a02111e..abe148a9ae2 100644 --- a/intern/cycles/hydra/field.cpp +++ b/intern/cycles/hydra/field.cpp @@ -44,10 +44,10 @@ class HdCyclesVolumeLoader : public VDBImageLoader { } } catch (const openvdb::IoError &e) { - LOG_WARNING << "Error loading OpenVDB file: " << e.what(); + LOG_ERROR << "Error loading OpenVDB file: " << e.what(); } catch (...) { - LOG_WARNING << "Error loading OpenVDB file: Unknown error"; + LOG_ERROR << "Error loading OpenVDB file: Unknown error"; } } }; diff --git a/intern/cycles/scene/colorspace.cpp b/intern/cycles/scene/colorspace.cpp index b16ff29f77c..7d8256acaa5 100644 --- a/intern/cycles/scene/colorspace.cpp +++ b/intern/cycles/scene/colorspace.cpp @@ -46,7 +46,7 @@ static void check_invalidate_caches() config = OCIO::GetCurrentConfig(); } catch (const OCIO::Exception &exception) { - LOG_WARNING << "OCIO config error: " << exception.what(); + LOG_ERROR << "OCIO config error: " << exception.what(); return; } @@ -80,7 +80,7 @@ ColorSpaceProcessor *ColorSpaceManager::get_processor(ustring colorspace) config = OCIO::GetCurrentConfig(); } catch (const OCIO::Exception &exception) { - LOG_WARNING << "OCIO config error: " << exception.what(); + LOG_ERROR << "OCIO config error: " << exception.what(); return nullptr; } @@ -128,7 +128,7 @@ bool ColorSpaceManager::colorspace_is_data(ustring colorspace) config = OCIO::GetCurrentConfig(); } catch (const OCIO::Exception &exception) { - LOG_WARNING << "OCIO config error: " << exception.what(); + LOG_ERROR << "OCIO config error: " << exception.what(); return false; } @@ -208,7 +208,7 @@ ustring ColorSpaceManager::detect_known_colorspace(ustring colorspace, config = OCIO::GetCurrentConfig(); } catch (const OCIO::Exception &exception) { - LOG_WARNING << "OCIO config error: " << exception.what(); + LOG_ERROR << "OCIO config error: " << exception.what(); return u_colorspace_raw; } diff --git a/intern/cycles/scene/image_oiio.cpp b/intern/cycles/scene/image_oiio.cpp index b58f4c31646..ebe103f99de 100644 --- a/intern/cycles/scene/image_oiio.cpp +++ b/intern/cycles/scene/image_oiio.cpp @@ -19,23 +19,28 @@ bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures & /*features*/, ImageMetaData &metadata) { /* Perform preliminary checks, with meaningful logging. */ + if (filepath.empty()) { + return false; + } + if (!path_exists(filepath.string())) { - LOG_WARNING << "File '" << filepath.string() << "' does not exist."; + LOG_ERROR << "Image file '" << filepath.string() << "' does not exist."; return false; } if (path_is_directory(filepath.string())) { - LOG_WARNING << "File '" << filepath.string() << "' is a directory, cannot use as image."; + LOG_ERROR << "Image file '" << filepath.string() << "' is a directory, cannot use as image."; return false; } unique_ptr in(ImageInput::create(filepath.string())); - if (!in) { + LOG_ERROR << "Image file '" << filepath.string() << "' failed to load."; return false; } ImageSpec spec; if (!in->open(filepath.string(), spec)) { + LOG_ERROR << "Image file '" << filepath.string() << "' failed to open."; return false; } diff --git a/intern/cycles/util/nanovdb.cpp b/intern/cycles/util/nanovdb.cpp index c8281c9fac8..5569ca1cfe3 100644 --- a/intern/cycles/util/nanovdb.cpp +++ b/intern/cycles/util/nanovdb.cpp @@ -272,10 +272,10 @@ struct ToNanoOp { # endif } catch (const std::exception &e) { - LOG_WARNING << "Error converting OpenVDB to NanoVDB grid: " << e.what(); + LOG_ERROR << "Error converting OpenVDB to NanoVDB grid: " << e.what(); } catch (...) { - LOG_WARNING << "Error converting OpenVDB to NanoVDB grid: Unknown error"; + LOG_ERROR << "Error converting OpenVDB to NanoVDB grid: Unknown error"; } return true; }