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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-07-16 04:45:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-16 04:45:03 +0300
commitd3c454d66c0a730eafa7edecec158ca3b9edb2d7 (patch)
tree6cc91044bc3c56a51afcc006ece14d1e7ed91f12 /source
parent98c4224ff032a746a54cc04b6d9a485620de0f4a (diff)
Cleanup: compiler warnings
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/asset/asset_list.cc2
-rw-r--r--source/blender/editors/include/ED_armature.h4
-rw-r--r--source/blender/editors/interface/interface_template_asset_view.cc6
-rw-r--r--source/blender/makesrna/intern/rna_asset.c2
-rw-r--r--source/blender/makesrna/intern/rna_space.c2
-rw-r--r--source/blender/windowmanager/WM_api.h2
-rw-r--r--source/blender/windowmanager/intern/wm_uilist_type.c2
7 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/asset/asset_list.cc b/source/blender/editors/asset/asset_list.cc
index 1ea948d97d4..e8ed3958231 100644
--- a/source/blender/editors/asset/asset_list.cc
+++ b/source/blender/editors/asset/asset_list.cc
@@ -301,7 +301,7 @@ void AssetList::clear(bContext *C)
filelist_freelib(files);
filelist_clear(files);
- WM_main_add_notifier(NC_ASSET | ND_ASSET_LIST, NULL);
+ WM_main_add_notifier(NC_ASSET | ND_ASSET_LIST, nullptr);
}
/**
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index eaa54f66928..51d8aa8b064 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -255,8 +255,8 @@ struct PoseBackup *ED_pose_backup_create_selected_bones(
struct PoseBackup *ED_pose_backup_create_all_bones(
const struct Object *ob, const struct bAction *action) ATTR_WARN_UNUSED_RESULT;
bool ED_pose_backup_is_selection_relevant(const struct PoseBackup *pose_backup);
-void ED_pose_backup_restore(const struct PoseBackup *pose_backup);
-void ED_pose_backup_free(struct PoseBackup *pose_backup);
+void ED_pose_backup_restore(const struct PoseBackup *pbd);
+void ED_pose_backup_free(struct PoseBackup *pbd);
#ifdef __cplusplus
}
diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc
index 2860abb32a1..5a05813f947 100644
--- a/source/blender/editors/interface/interface_template_asset_view.cc
+++ b/source/blender/editors/interface/interface_template_asset_view.cc
@@ -53,7 +53,7 @@ static void asset_view_item_but_drag_set(uiBut *but,
AssetHandle *asset_handle)
{
ID *id = asset_handle->file_data->id;
- if (id != NULL) {
+ if (id != nullptr) {
UI_but_drag_set_id(but, id);
return;
}
@@ -257,14 +257,14 @@ void uiTemplateAssetView(uiLayout *layout,
if (activate_opname) {
PointerRNA *ptr = UI_list_custom_activate_operator_set(
- list, activate_opname, r_activate_op_properties != NULL);
+ list, activate_opname, r_activate_op_properties != nullptr);
if (r_activate_op_properties && ptr) {
*r_activate_op_properties = *ptr;
}
}
if (drag_opname) {
PointerRNA *ptr = UI_list_custom_drag_operator_set(
- list, drag_opname, r_drag_op_properties != NULL);
+ list, drag_opname, r_drag_op_properties != nullptr);
if (r_drag_op_properties && ptr) {
*r_drag_op_properties = *ptr;
}
diff --git a/source/blender/makesrna/intern/rna_asset.c b/source/blender/makesrna/intern/rna_asset.c
index 497f4f37ea3..0020d90ba1a 100644
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@ -137,7 +137,7 @@ static void rna_AssetHandle_get_full_library_path(
bContext *C,
FileDirEntry *asset_file,
AssetLibraryReference *library,
- char r_result[FILE_MAX_LIBEXTRA])
+ char r_result[/*FILE_MAX_LIBEXTRA*/])
{
AssetHandle asset = {.file_data = asset_file};
ED_asset_handle_get_full_library_path(C, library, &asset, r_result);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 0019f315bbe..f2d2b190d87 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2699,7 +2699,7 @@ static const EnumPropertyItem *rna_FileBrowser_FileSelectEntry_id_type_itemf(
{
const FileDirEntry *entry = ptr->data;
if (entry->blentype == 0) {
- const static EnumPropertyItem none_items[] = {
+ static const EnumPropertyItem none_items[] = {
{0, "NONE", 0, "None", ""},
};
return none_items;
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 66e91526009..1c994707ca9 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -623,7 +623,7 @@ void WM_uilisttype_free(void);
void WM_uilisttype_to_full_list_id(const struct uiListType *ult,
const char *list_id,
- char *r_ui_list_id);
+ char r_full_list_id[]);
const char *WM_uilisttype_list_id_get(const struct uiListType *ult, struct uiList *list);
/* wm_menu_type.c */
diff --git a/source/blender/windowmanager/intern/wm_uilist_type.c b/source/blender/windowmanager/intern/wm_uilist_type.c
index 468ea7e4d5b..53193deae8c 100644
--- a/source/blender/windowmanager/intern/wm_uilist_type.c
+++ b/source/blender/windowmanager/intern/wm_uilist_type.c
@@ -163,7 +163,7 @@ void WM_uilisttype_free(void)
*/
void WM_uilisttype_to_full_list_id(const uiListType *ult,
const char *list_id,
- char r_full_list_id[UI_MAX_NAME_STR])
+ char r_full_list_id[/*UI_MAX_NAME_STR*/])
{
/* We tag the list id with the list type... */
BLI_snprintf(r_full_list_id, UI_MAX_NAME_STR, "%s_%s", ult->idname, list_id ? list_id : "");