diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index 85c4dea5812..e8b250f2d0f 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -1020,7 +1020,7 @@ static void write_libraries(WriteData *wd, Main *main) } #ifdef WITH_BUILDINFO -extern "C" unsigned long build_commit_timestamp; +extern "C" ulong build_commit_timestamp; extern "C" char build_hash[]; #endif diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc index d7aa770f805..637212da621 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc @@ -285,7 +285,7 @@ void VIEW3D_OT_view_all(wmOperatorType *ot) /* properties */ view3d_operator_properties_common(ot, V3D_OP_PROP_USE_ALL_REGIONS); - RNA_def_boolean(ot->srna, "center", 0, "Center", ""); + RNA_def_boolean(ot->srna, "center", false, "Center", ""); } /** \} */ @@ -412,7 +412,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) BKE_paint_stroke_get_average(scene, ob_eval, min); copy_v3_v3(max, min); ok = true; - ok_dist = 0; /* don't zoom */ + ok_dist = false; /* don't zoom */ } else { LISTBASE_FOREACH (Base *, base_eval, BKE_view_layer_object_bases_get(view_layer_eval)) { @@ -423,7 +423,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) continue; } view3d_object_calc_minmax(depsgraph, scene, base_eval->object, only_center, min, max); - ok = 1; + ok = true; } } } diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc index 7078791d8aa..eb55f4217a1 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc @@ -193,10 +193,10 @@ void VIEW3D_OT_view_axis(wmOperatorType *ot) RNA_def_property_translation_context(ot->prop, BLT_I18NCONTEXT_EDITOR_VIEW3D); prop = RNA_def_boolean( - ot->srna, "align_active", 0, "Align Active", "Align to the active object's axis"); + ot->srna, "align_active", false, "Align Active", "Align to the active object's axis"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean( - ot->srna, "relative", 0, "Relative", "Rotate relative to the current orientation"); + ot->srna, "relative", false, "Relative", "Rotate relative to the current orientation"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc b/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc index 8d0f2d69429..975c1b72d46 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_dolly.cc @@ -333,7 +333,7 @@ void VIEW3D_OT_dolly(wmOperatorType *ot) ViewOpsType ViewOpsType_dolly = { /*flag*/ (VIEWOPS_FLAG_DEPTH_NAVIGATE | VIEWOPS_FLAG_ZOOM_TO_MOUSE), /*idname*/ "VIEW3D_OT_dolly", + /*poll_fn*/ nullptr, /*init_fn*/ nullptr, /*apply_fn*/ nullptr, - /*cancel_fn*/ nullptr, }; diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc b/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc index d2be02c479f..1e2ba04f990 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_roll.cc @@ -303,7 +303,7 @@ void VIEW3D_OT_view_roll(wmOperatorType *ot) const ViewOpsType ViewOpsType_roll = { /*flag*/ (VIEWOPS_FLAG_ORBIT_SELECT), /*idname*/ "VIEW3D_OT_view_roll", + /*poll_fn*/ nullptr, /*init_fn*/ nullptr, /*apply_fn*/ nullptr, - /*cancel_fn*/ nullptr, }; diff --git a/source/blender/editors/transform/transform_ops.cc b/source/blender/editors/transform/transform_ops.cc index b70b0c7c0ce..2ad072e66e3 100644 --- a/source/blender/editors/transform/transform_ops.cc +++ b/source/blender/editors/transform/transform_ops.cc @@ -803,7 +803,7 @@ void Transform_Properties(wmOperatorType *ot, int flags) if (flags & P_VIEW3D_ALT_NAVIGATION) { prop = RNA_def_boolean( - ot->srna, "alt_navigation", 0, "Transform Navigation with Alt", nullptr); + ot->srna, "alt_navigation", false, "Transform Navigation with Alt", nullptr); RNA_def_property_flag(prop, PROP_HIDDEN); } diff --git a/source/creator/buildinfo.c b/source/creator/buildinfo.c index e9e0cdf7062..17e182f98fd 100644 --- a/source/creator/buildinfo.c +++ b/source/creator/buildinfo.c @@ -6,6 +6,8 @@ * \ingroup creator */ +#include "BLI_sys_types.h" + #ifdef WITH_BUILDINFO_HEADER # include "buildinfo.h" #endif @@ -15,7 +17,7 @@ extern char build_date[]; extern char build_time[]; extern char build_hash[]; -extern unsigned long build_commit_timestamp; +extern ulong build_commit_timestamp; extern char build_commit_date[]; extern char build_commit_time[]; extern char build_branch[]; @@ -30,7 +32,7 @@ extern char build_system[]; char build_date[] = BUILD_DATE; char build_time[] = BUILD_TIME; char build_hash[] = BUILD_HASH; -unsigned long build_commit_timestamp = BUILD_COMMIT_TIMESTAMP; +ulong build_commit_timestamp = BUILD_COMMIT_TIMESTAMP; char build_commit_date[16] = "\0"; char build_commit_time[16] = "\0"; char build_branch[] = BUILD_BRANCH;