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>2021-07-26 05:39:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-26 05:41:49 +0300
commit501bca9f5b1265e6f336bc7c1878b9b50a70356a (patch)
treec6f80868381a9ab8922b8d2033b988cd4a632f77
parent828c66f393232f99272122623cacf2266cccbfa2 (diff)
Cleanup: clang-format
-rw-r--r--intern/ghost/intern/GHOST_ISystem.cpp7
-rw-r--r--source/blender/editors/asset/ED_asset_temp_id_consumer.h13
2 files changed, 11 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp
index cb85edb728b..d1f5e2ba11d 100644
--- a/intern/ghost/intern/GHOST_ISystem.cpp
+++ b/intern/ghost/intern/GHOST_ISystem.cpp
@@ -58,9 +58,10 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
try {
m_system = new GHOST_SystemWayland();
if (!std::getenv("BLENDER_WAYLAND")) {
- printf("Connected to a Wayland compositor but Wayland is disabled at "\
- "runtime.\nSet environment variable 'BLENDER_WAYLAND' (e.g. "\
- "BLENDER_WAYLAND= blender) to use Wayland.\n");
+ printf(
+ "Connected to a Wayland compositor but Wayland is disabled at runtime.\n"
+ "Set environment variable 'BLENDER_WAYLAND' "
+ "(e.g. BLENDER_WAYLAND= blender) to use Wayland.\n");
throw std::runtime_error(std::string());
}
}
diff --git a/source/blender/editors/asset/ED_asset_temp_id_consumer.h b/source/blender/editors/asset/ED_asset_temp_id_consumer.h
index 8aa53f9ea3b..9af08c5c52b 100644
--- a/source/blender/editors/asset/ED_asset_temp_id_consumer.h
+++ b/source/blender/editors/asset/ED_asset_temp_id_consumer.h
@@ -36,12 +36,13 @@ struct ReportList;
AssetTempIDConsumer *ED_asset_temp_id_consumer_create(const struct AssetHandle *handle);
void ED_asset_temp_id_consumer_free(AssetTempIDConsumer **consumer);
-struct ID *ED_asset_temp_id_consumer_ensure_local_id(AssetTempIDConsumer *consumer,
- const struct bContext *C,
- const struct AssetLibraryReference *asset_library,
- ID_Type id_type,
- struct Main *bmain,
- struct ReportList *reports);
+struct ID *ED_asset_temp_id_consumer_ensure_local_id(
+ AssetTempIDConsumer *consumer,
+ const struct bContext *C,
+ const struct AssetLibraryReference *asset_library,
+ ID_Type id_type,
+ struct Main *bmain,
+ struct ReportList *reports);
#ifdef __cplusplus
}