[Bf-blender-cvs] [501bca9f5b1] master: Cleanup: clang-format

Campbell Barton noreply at git.blender.org
Mon Jul 26 04:42:48 CEST 2021


Commit: 501bca9f5b1265e6f336bc7c1878b9b50a70356a
Author: Campbell Barton
Date:   Mon Jul 26 12:39:45 2021 +1000
Branches: master
https://developer.blender.org/rB501bca9f5b1265e6f336bc7c1878b9b50a70356a

Cleanup: clang-format

===================================================================

M	intern/ghost/intern/GHOST_ISystem.cpp
M	source/blender/editors/asset/ED_asset_temp_id_consumer.h

===================================================================

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
 }



More information about the Bf-blender-cvs mailing list