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-16 04:45:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-16 04:45:03 +0300
commitd3c454d66c0a730eafa7edecec158ca3b9edb2d7 (patch)
tree6cc91044bc3c56a51afcc006ece14d1e7ed91f12 /source/blender/editors
parent98c4224ff032a746a54cc04b6d9a485620de0f4a (diff)
Cleanup: compiler warnings
Diffstat (limited to 'source/blender/editors')
-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
3 files changed, 6 insertions, 6 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;
}