blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2021-07-26 12:39:45 +10:00
parent 828c66f393
commit 501bca9f5b
Notes: blender-bot 2023-02-14 07:39:44 +01:00 
Referenced by issue #90158, Can't open blendfile
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/ghost/intern/GHOST_ISystem.cpp
View File

@ -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());
}
}

13
source/blender/editors/asset/ED_asset_temp_id_consumer.h
View File

@ -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
}