blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: compiler warnings

This commit is contained in:
Campbell Barton 2021-07-16 11:45:03 +10:00
parent 98c4224ff0
commit d3c454d66c
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/asset/asset_list.cc
View File

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

4
source/blender/editors/include/ED_armature.h
View File

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

6
source/blender/editors/interface/interface_template_asset_view.cc
View File

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

2
source/blender/makesrna/intern/rna_asset.c
View File

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

2
source/blender/makesrna/intern/rna_space.c
View File

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

2
source/blender/windowmanager/WM_api.h
View File

@ -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 */

2
source/blender/windowmanager/intern/wm_uilist_type.c
View File

@ -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 : "");