Merge branch 'master' into temp-geometry-nodes-expandable-geometry-socket-prototype

40 files changed, 107 insertions, 97 deletions

diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index 6469c47ab11..735f3b86924 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -522,6 +522,7 @@ static bool find_prev_next_keyframes(struct bContext *C, int *r_nextfra, int *r_
     mask_to_keylist(&ads, masklay, keylist);
   }
 
+  /* TODO(jbakker): Keylists are ordered, no need to do any searching at all. */
   /* find matching keyframe in the right direction */
   do {
     aknext = ED_keylist_find_next(keylist, cfranext);
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index b2d387ea898..020518b5813 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1892,7 +1892,7 @@ static size_t animdata_filter_gpencil(bAnimContext *ac,
         }
 
         /* outliner restrict-flag */
-        if (ob->restrictflag & OB_RESTRICT_VIEWPORT) {
+        if (ob->visibility_flag & OB_HIDE_VIEWPORT) {
           continue;
         }
       }
@@ -3098,7 +3098,7 @@ static bool animdata_filter_base_is_ok(bDopeSheet *ads, Base *base, int filter_m
     }
 
     /* outliner restrict-flag */
-    if (ob->restrictflag & OB_RESTRICT_VIEWPORT) {
+    if (ob->visibility_flag & OB_HIDE_VIEWPORT) {
       return false;
     }
   }
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index cfcea950955..0de3f429bc7 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -445,7 +445,7 @@ static void draw_marker_name(const uchar *text_color,
   if (marker->camera) {
     Object *camera = marker->camera;
     name = camera->id.name + 2;
-    if (camera->restrictflag & OB_RESTRICT_RENDER) {
+    if (camera->visibility_flag & OB_HIDE_RENDER) {
       final_text_color[3] = 100;
     }
   }
diff --git a/source/blender/editors/animation/anim_motion_paths.c b/source/blender/editors/animation/anim_motion_paths.c
index 2a3ae35aab0..d976f5f72ad 100644
--- a/source/blender/editors/animation/anim_motion_paths.c
+++ b/source/blender/editors/animation/anim_motion_paths.c
@@ -234,6 +234,7 @@ static void motionpath_get_global_framerange(ListBase *targets, int *r_sfra, int
   }
 }
 
+/* TODO(jbakker): Remove complexity, keylists are ordered. */
 static int motionpath_get_prev_keyframe(MPathTarget *mpt,
                                         struct AnimKeylist *keylist,
                                         int current_frame)
diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index 1118e84ef4f..3798ca308ed 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -908,7 +908,7 @@ static int pose_paste_exec(bContext *C, wmOperator *op)
   DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
 
   /* Recalculate paths if any of the bones have paths... */
-  if ((ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) {
+  if (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) {
     ED_pose_recalculate_paths(C, scene, ob, POSE_PATH_CALC_RANGE_FULL);
   }
 
@@ -1219,7 +1219,7 @@ static int pose_clear_transform_generic_exec(bContext *C,
         ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
 
         /* now recalculate paths */
-        if ((ob_iter->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) {
+        if (ob_iter->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) {
           ED_pose_recalculate_paths(C, scene, ob_iter, POSE_PATH_CALC_RANGE_FULL);
         }
 
diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc
index f18cf9712db..579803f7ff7 100644
--- a/source/blender/editors/asset/intern/asset_ops.cc
+++ b/source/blender/editors/asset/intern/asset_ops.cc
@@ -110,7 +110,7 @@ void AssetMarkHelper::reportResults(ReportList &reports) const
 {
   /* User feedback on failure. */
   if (!wasSuccessful()) {
-    if ((stats.tot_already_asset > 0)) {
+    if (stats.tot_already_asset > 0) {
       BKE_report(&reports,
                  RPT_ERROR,
                  "Selected data-blocks are already assets (or do not support use as assets)");
diff --git a/source/blender/editors/curve/editcurve_add.c b/source/blender/editors/curve/editcurve_add.c
index 2be55accd3a..d1fe162fc4a 100644
--- a/source/blender/editors/curve/editcurve_add.c
+++ b/source/blender/editors/curve/editcurve_add.c
@@ -431,7 +431,7 @@ Nurb *ED_curve_add_nurbs_primitive(
         if (newob && (U.flag & USER_ADD_VIEWALIGNED) == 0) {
           ed_editnurb_spin(umat, NULL, obedit, tmp_vec, tmp_cent);
         }
-        else if ((U.flag & USER_ADD_VIEWALIGNED)) {
+        else if (U.flag & USER_ADD_VIEWALIGNED) {
           ed_editnurb_spin(viewmat, NULL, obedit, zvec, mat[3]);
         }
         else {
@@ -466,7 +466,7 @@ Nurb *ED_curve_add_nurbs_primitive(
         if (newob && (U.flag & USER_ADD_VIEWALIGNED) == 0) {
           ed_editnurb_spin(umat, NULL, obedit, tmp_vec, tmp_cent);
         }
-        else if ((U.flag & USER_ADD_VIEWALIGNED)) {
+        else if (U.flag & USER_ADD_VIEWALIGNED) {
           ed_editnurb_spin(viewmat, NULL, obedit, zvec, mat[3]);
         }
         else {
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index d6f6dbb2b10..aaea1c0ddaf 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -996,6 +996,9 @@ static void gpencil_stroke_newfrombuffer(tGPsdata *p)
   gps->inittime = p->inittime;
   gps->uv_scale = 1.0f;
 
+  /* Set stroke caps. */
+  gps->caps[0] = gps->caps[1] = brush->gpencil_settings->caps_type;
+
   /* allocate enough memory for a continuous array for storage points */
   const int subdivide = brush->gpencil_settings->draw_subdivide;
 
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index cf49aefe2ea..27374f21b66 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -335,6 +335,9 @@ static void gpencil_primitive_set_initdata(bContext *C, tGPDprimitive *tgpi)
   gps->uv_scale = 1.0f;
   gps->inittime = 0.0f;
 
+  /* Set stroke caps. */
+  gps->caps[0] = gps->caps[1] = brush->gpencil_settings->caps_type;
+
   /* Apply the vertex color to fill. */
   ED_gpencil_fill_vertex_color_set(ts, brush, gps);
 
diff --git a/source/blender/editors/include/ED_keyframes_keylist.h b/source/blender/editors/include/ED_keyframes_keylist.h
index e7d1b5d4363..d3690fa3aa0 100644
--- a/source/blender/editors/include/ED_keyframes_keylist.h
+++ b/source/blender/editors/include/ED_keyframes_keylist.h
@@ -190,7 +190,9 @@ void gpencil_to_keylist(struct bDopeSheet *ads,
 /* Grease Pencil Layer */
 void gpl_to_keylist(struct bDopeSheet *ads, struct bGPDlayer *gpl, struct AnimKeylist *keylist);
 /* Mask */
-void mask_to_keylist(struct bDopeSheet *ads, struct MaskLayer *masklay, struct AnimKeylist *keylist);
+void mask_to_keylist(struct bDopeSheet *ads,
+                     struct MaskLayer *masklay,
+                     struct AnimKeylist *keylist);
 
 /* ActKeyColumn API ---------------- */
 /* Comparator callback used for ActKeyColumns and cframe float-value pointer */
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index d3a3df98d99..fd75be5b847 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -6173,7 +6173,7 @@ int UI_but_return_value_get(uiBut *but)
 void UI_but_drag_set_id(uiBut *but, ID *id)
 {
   but->dragtype = WM_DRAG_ID;
-  if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
+  if (but->dragflag & UI_BUT_DRAGPOIN_FREE) {
     WM_drag_data_free(but->dragtype, but->dragpoin);
     but->dragflag &= ~UI_BUT_DRAGPOIN_FREE;
   }
@@ -6200,7 +6200,7 @@ void UI_but_drag_set_asset(uiBut *but,
 
   but->dragtype = WM_DRAG_ASSET;
   ui_def_but_icon(but, icon, 0); /* no flag UI_HAS_ICON, so icon doesn't draw in button */
-  if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
+  if (but->dragflag & UI_BUT_DRAGPOIN_FREE) {
     WM_drag_data_free(but->dragtype, but->dragpoin);
   }
   but->dragpoin = asset_drag;
@@ -6212,7 +6212,7 @@ void UI_but_drag_set_asset(uiBut *but,
 void UI_but_drag_set_rna(uiBut *but, PointerRNA *ptr)
 {
   but->dragtype = WM_DRAG_RNA;
-  if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
+  if (but->dragflag & UI_BUT_DRAGPOIN_FREE) {
     WM_drag_data_free(but->dragtype, but->dragpoin);
     but->dragflag &= ~UI_BUT_DRAGPOIN_FREE;
   }
@@ -6222,7 +6222,7 @@ void UI_but_drag_set_rna(uiBut *but, PointerRNA *ptr)
 void UI_but_drag_set_path(uiBut *but, const char *path, const bool use_free)
 {
   but->dragtype = WM_DRAG_PATH;
-  if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
+  if (but->dragflag & UI_BUT_DRAGPOIN_FREE) {
     WM_drag_data_free(but->dragtype, but->dragpoin);
     but->dragflag &= ~UI_BUT_DRAGPOIN_FREE;
   }
@@ -6235,7 +6235,7 @@ void UI_but_drag_set_path(uiBut *but, const char *path, const bool use_free)
 void UI_but_drag_set_name(uiBut *but, const char *name)
 {
   but->dragtype = WM_DRAG_NAME;
-  if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
+  if (but->dragflag & UI_BUT_DRAGPOIN_FREE) {
     WM_drag_data_free(but->dragtype, but->dragpoin);
     but->dragflag &= ~UI_BUT_DRAGPOIN_FREE;
   }
@@ -6253,7 +6253,7 @@ void UI_but_drag_set_image(
 {
   but->dragtype = WM_DRAG_PATH;
   ui_def_but_icon(but, icon, 0); /* no flag UI_HAS_ICON, so icon doesn't draw in button */
-  if ((but->dragflag & UI_BUT_DRAGPOIN_FREE)) {
+  if (but->dragflag & UI_BUT_DRAGPOIN_FREE) {
     WM_drag_data_free(but->dragtype, but->dragpoin);
     but->dragflag &= ~UI_BUT_DRAGPOIN_FREE;
   }
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index bfc03a95949..d920ebbe11a 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6779,7 +6779,7 @@ static bool ui_numedit_but_HSVCIRCLE(uiBut *but,
 
   ui_color_picker_hsv_to_rgb(hsv, rgb);
 
-  if ((cpicker->use_luminosity_lock)) {
+  if (cpicker->use_luminosity_lock) {
     if (!is_zero_v3(rgb)) {
       normalize_v3_length(rgb, cpicker->luminosity_lock_value);
     }
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 6755eded05c..2d59bfb92c8 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1014,7 +1014,7 @@ static void init_iconfile_list(struct ListBase *list)
 
   int index = 1;
   for (int i = 0; i < totfile; i++) {
-    if ((dir[i].type & S_IFREG)) {
+    if (dir[i].type & S_IFREG) {
       const char *filename = dir[i].relname;
 
       if (BLI_path_extension_check(filename, ".png")) {
diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c
index ad71f4d9da7..110f4541e8f 100644
--- a/source/blender/editors/mask/mask_add.c
+++ b/source/blender/editors/mask/mask_add.c
@@ -521,7 +521,7 @@ static int add_vertex_exec(bContext *C, wmOperator *op)
 
   MaskLayer *mask_layer = BKE_mask_layer_active(mask);
 
-  if (mask_layer && mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+  if (mask_layer && mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
     mask_layer = NULL;
   }
 
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index de8ea8e21eb..22232e9c87e 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -191,7 +191,7 @@ static void draw_spline_points(const bContext *C,
                                const char draw_type)
 {
   const bool is_spline_sel = (spline->flag & SELECT) &&
-                             (mask_layer->restrictflag & MASK_RESTRICT_SELECT) == 0;
+                             (mask_layer->visibility_flag & MASK_HIDE_SELECT) == 0;
   const bool is_smooth = (draw_flag & MASK_DRAWFLAG_SMOOTH) != 0;
 
   uchar rgb_spline[4];
@@ -529,7 +529,7 @@ static void draw_spline_curve(const bContext *C,
   uchar rgb_tmp[4];
 
   const bool is_spline_sel = (spline->flag & SELECT) &&
-                             (mask_layer->restrictflag & MASK_RESTRICT_SELECT) == 0;
+                             (mask_layer->visibility_flag & MASK_HIDE_SELECT) == 0;
   const bool is_smooth = (draw_flag & MASK_DRAWFLAG_SMOOTH) != 0;
   const bool is_fill = (spline->flag & MASK_SPLINE_NOFILL) == 0;
 
@@ -604,7 +604,7 @@ static void draw_mask_layers(const bContext *C,
        mask_layer = mask_layer->next, i++) {
     const bool is_active = (i == mask->masklay_act);
 
-    if (mask_layer->restrictflag & MASK_RESTRICT_VIEW) {
+    if (mask_layer->visibility_flag & MASK_HIDE_VIEW) {
       continue;
     }
 
@@ -613,7 +613,7 @@ static void draw_mask_layers(const bContext *C,
       /* draw curve itself first... */
       draw_spline_curve(C, mask_layer, spline, draw_flag, draw_type, is_active, width, height);
 
-      if (!(mask_layer->restrictflag & MASK_RESTRICT_SELECT)) {
+      if (!(mask_layer->visibility_flag & MASK_HIDE_SELECT)) {
         /* ...and then handles over the curve so they're nicely visible */
         draw_spline_points(C, mask_layer, spline, draw_flag, draw_type);
       }
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 6fa7457ce14..fd5925bbd0c 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -287,7 +287,7 @@ static bool spline_under_mouse_get(const bContext *C,
   }
   for (MaskLayer *mask_layer = mask->masklayers.first; mask_layer != NULL;
        mask_layer = mask_layer->next) {
-    if (mask_layer->restrictflag & MASK_RESTRICT_SELECT) {
+    if (mask_layer->visibility_flag & MASK_HIDE_SELECT) {
       continue;
     }
 
@@ -1322,7 +1322,7 @@ static int cyclic_toggle_exec(bContext *C, wmOperator *UNUSED(op))
   Mask *mask = CTX_data_edit_mask(C);
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -1403,7 +1403,7 @@ static int delete_exec(bContext *C, wmOperator *UNUSED(op))
     MaskSpline *spline;
     int mask_layer_shape_ofs = 0;
 
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -1523,7 +1523,7 @@ static int mask_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
     bool changed_layer = false;
 
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -1581,7 +1581,7 @@ static int mask_normals_make_consistent_exec(bContext *C, wmOperator *UNUSED(op)
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
     bool changed_layer = false;
 
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -1642,7 +1642,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
   bool changed = false;
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -1724,9 +1724,9 @@ static int mask_hide_view_clear_exec(bContext *C, wmOperator *op)
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
 
-    if (mask_layer->restrictflag & OB_RESTRICT_VIEWPORT) {
+    if (mask_layer->visibility_flag & OB_HIDE_VIEWPORT) {
       ED_mask_layer_select_set(mask_layer, select);
-      mask_layer->restrictflag &= ~OB_RESTRICT_VIEWPORT;
+      mask_layer->visibility_flag &= ~OB_HIDE_VIEWPORT;
       changed = true;
     }
   }
@@ -1766,7 +1766,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
 
-    if (mask_layer->restrictflag & MASK_RESTRICT_SELECT) {
+    if (mask_layer->visibility_flag & MASK_HIDE_SELECT) {
       continue;
     }
 
@@ -1774,7 +1774,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
       if (ED_mask_layer_select_check(mask_layer)) {
         ED_mask_layer_select_set(mask_layer, false);
 
-        mask_layer->restrictflag |= OB_RESTRICT_VIEWPORT;
+        mask_layer->visibility_flag |= OB_HIDE_VIEWPORT;
         changed = true;
         if (mask_layer == BKE_mask_layer_active(mask)) {
           BKE_mask_layer_active_set(mask, NULL);
@@ -1783,7 +1783,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
     }
     else {
       if (!ED_mask_layer_select_check(mask_layer)) {
-        mask_layer->restrictflag |= OB_RESTRICT_VIEWPORT;
+        mask_layer->visibility_flag |= OB_HIDE_VIEWPORT;
         changed = true;
         if (mask_layer == BKE_mask_layer_active(mask)) {
           BKE_mask_layer_active_set(mask, NULL);
@@ -1825,7 +1825,7 @@ static int mask_feather_weight_clear_exec(bContext *C, wmOperator *UNUSED(op))
   bool changed = false;
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_SELECT | MASK_RESTRICT_VIEW)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_SELECT | MASK_HIDE_VIEW)) {
       continue;
     }
 
diff --git a/source/blender/editors/mask/mask_query.c b/source/blender/editors/mask/mask_query.c
index cd51026d20c..e66c4e45e27 100644
--- a/source/blender/editors/mask/mask_query.c
+++ b/source/blender/editors/mask/mask_query.c
@@ -85,7 +85,7 @@ bool ED_mask_find_nearest_diff_point(const bContext *C,
                  *mask_layer_eval = mask_eval->masklayers.first;
        mask_layer_orig != NULL;
        mask_layer_orig = mask_layer_orig->next, mask_layer_eval = mask_layer_eval->next) {
-    if (mask_layer_orig->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer_orig->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -245,7 +245,7 @@ MaskSplinePoint *ED_mask_point_find_nearest(const bContext *C,
        mask_layer_orig != NULL;
        mask_layer_orig = mask_layer_orig->next, mask_layer_eval = mask_layer_eval->next) {
 
-    if (mask_layer_orig->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer_orig->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -409,7 +409,7 @@ bool ED_mask_feather_find_nearest(const bContext *C,
       int i, tot_feather_point;
       float(*feather_points)[2], (*fp)[2];
 
-      if (mask_layer_orig->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+      if (mask_layer_orig->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
         continue;
       }
 
@@ -638,7 +638,7 @@ bool ED_mask_selected_minmax(const bContext *C,
   INIT_MINMAX2(min, max);
   for (MaskLayer *mask_layer = mask_eval->masklayers.first; mask_layer != NULL;
        mask_layer = mask_layer->next) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
     for (MaskSpline *spline = mask_layer->splines.first; spline != NULL; spline = spline->next) {
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
index 971e1c948c9..9c4740b3087 100644
--- a/source/blender/editors/mask/mask_relationships.c
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -46,7 +46,7 @@ static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
   Mask *mask = CTX_data_edit_mask(C);
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -138,7 +138,7 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
   }
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c
index 8ddc3758e4e..6a1be8dcef3 100644
--- a/source/blender/editors/mask/mask_select.c
+++ b/source/blender/editors/mask/mask_select.c
@@ -68,7 +68,7 @@ bool ED_mask_spline_select_check(const MaskSpline *spline)
 
 bool ED_mask_layer_select_check(const MaskLayer *mask_layer)
 {
-  if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+  if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
     return false;
   }
 
@@ -110,7 +110,7 @@ void ED_mask_spline_select_set(MaskSpline *spline, const bool do_select)
 
 void ED_mask_layer_select_set(MaskLayer *mask_layer, const bool do_select)
 {
-  if (mask_layer->restrictflag & MASK_RESTRICT_SELECT) {
+  if (mask_layer->visibility_flag & MASK_HIDE_SELECT) {
     if (do_select == true) {
       return;
     }
@@ -134,7 +134,7 @@ void ED_mask_select_toggle_all(Mask *mask, int action)
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
 
-    if (mask_layer->restrictflag & MASK_RESTRICT_VIEW) {
+    if (mask_layer->visibility_flag & MASK_HIDE_VIEW) {
       continue;
     }
 
@@ -142,7 +142,7 @@ void ED_mask_select_toggle_all(Mask *mask, int action)
       /* we don't have generic functions for this, its restricted to this operator
        * if one day we need to re-use such functionality, they can be split out */
 
-      if (mask_layer->restrictflag & MASK_RESTRICT_SELECT) {
+      if (mask_layer->visibility_flag & MASK_HIDE_SELECT) {
         continue;
       }
       LISTBASE_FOREACH (MaskSpline *, spline, &mask_layer->splines) {
@@ -166,7 +166,7 @@ void ED_mask_select_flush_all(Mask *mask)
 
       /* Intentionally *don't* do this in the mask layer loop
        * so we clear flags on all splines. */
-      if (mask_layer->restrictflag & MASK_RESTRICT_VIEW) {
+      if (mask_layer->visibility_flag & MASK_HIDE_VIEW) {
         continue;
       }
 
@@ -465,7 +465,7 @@ static int box_select_exec(bContext *C, wmOperator *op)
 
   /* do actual selection */
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -550,7 +550,7 @@ static bool do_lasso_select_mask(bContext *C,
 
   /* do actual selection */
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -691,7 +691,7 @@ static int circle_select_exec(bContext *C, wmOperator *op)
 
   /* do actual selection */
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -820,7 +820,7 @@ static int mask_select_linked_exec(bContext *C, wmOperator *UNUSED(op))
 
   /* do actual selection */
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -870,7 +870,7 @@ static int mask_select_more_less(bContext *C, bool more)
   Mask *mask = CTX_data_edit_mask(C);
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c
index a5a3489c143..6620096c39a 100644
--- a/source/blender/editors/mask/mask_shapekey.c
+++ b/source/blender/editors/mask/mask_shapekey.c
@@ -144,7 +144,7 @@ static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
 
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -238,7 +238,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
   const bool do_location = RNA_boolean_get(op->ptr, "location");
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 8ae74fbfafa..f98f3242163 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -3530,7 +3530,7 @@ static int object_add_named_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
-  basen->object->restrictflag &= ~OB_RESTRICT_VIEWPORT;
+  basen->object->visibility_flag &= ~OB_HIDE_VIEWPORT;
 
   int mval[2];
   if (object_add_drop_xy_get(C, op, &mval)) {
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 43358f51396..0a2df655395 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -1311,7 +1311,7 @@ static int bake(const BakeAPIRender *bkr,
       }
       else {
         ob_cage_eval = DEG_get_evaluated_object(depsgraph, ob_cage);
-        ob_cage_eval->restrictflag |= OB_RESTRICT_RENDER;
+        ob_cage_eval->visibility_flag |= OB_HIDE_RENDER;
         ob_cage_eval->base_flag &= ~(BASE_VISIBLE_DEPSGRAPH | BASE_ENABLED_RENDER);
       }
     }
@@ -1411,7 +1411,7 @@ static int bake(const BakeAPIRender *bkr,
       /* initialize highpoly_data */
       highpoly[i].ob = ob_iter;
       highpoly[i].ob_eval = DEG_get_evaluated_object(depsgraph, ob_iter);
-      highpoly[i].ob_eval->restrictflag &= ~OB_RESTRICT_RENDER;
+      highpoly[i].ob_eval->visibility_flag &= ~OB_HIDE_RENDER;
       highpoly[i].ob_eval->base_flag |= (BASE_VISIBLE_DEPSGRAPH | BASE_ENABLED_RENDER);
       highpoly[i].me = BKE_mesh_new_from_object(NULL, highpoly[i].ob_eval, false, false);
 
@@ -1427,10 +1427,10 @@ static int bake(const BakeAPIRender *bkr,
     BLI_assert(i == tot_highpoly);
 
     if (ob_cage != NULL) {
-      ob_cage_eval->restrictflag |= OB_RESTRICT_RENDER;
+      ob_cage_eval->visibility_flag |= OB_HIDE_RENDER;
       ob_cage_eval->base_flag &= ~(BASE_VISIBLE_DEPSGRAPH | BASE_ENABLED_RENDER);
     }
-    ob_low_eval->restrictflag |= OB_RESTRICT_RENDER;
+    ob_low_eval->visibility_flag |= OB_HIDE_RENDER;
     ob_low_eval->base_flag &= ~(BASE_VISIBLE_DEPSGRAPH | BASE_ENABLED_RENDER);
 
     /* populate the pixel arrays with the corresponding face data for each high poly object */
@@ -1473,7 +1473,7 @@ static int bake(const BakeAPIRender *bkr,
   }
   else {
     /* If low poly is not renderable it should have failed long ago. */
-    BLI_assert((ob_low_eval->restrictflag & OB_RESTRICT_RENDER) == 0);
+    BLI_assert((ob_low_eval->visibility_flag & OB_HIDE_RENDER) == 0);
 
     if (RE_bake_has_engine(re)) {
       ok = RE_bake_engine(re,
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 6108691b2f1..5697c2c973d 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -384,7 +384,7 @@ static int object_hide_collection_exec(bContext *C, wmOperator *op)
   DEG_id_tag_update(&scene->id, ID_RECALC_BASE_FLAGS);
 
   if (v3d->flag & V3D_LOCAL_COLLECTIONS) {
-    if (lc->runtime_flag & LAYER_COLLECTION_RESTRICT_VIEWPORT) {
+    if (lc->runtime_flag & LAYER_COLLECTION_HIDE_VIEWPORT) {
       return OPERATOR_CANCELLED;
     }
     if (toggle) {
@@ -421,7 +421,7 @@ void ED_collection_hide_menu_draw(const bContext *C, uiLayout *layout)
       continue;
     }
 
-    if (lc->collection->flag & COLLECTION_RESTRICT_VIEWPORT) {
+    if (lc->collection->flag & COLLECTION_HIDE_VIEWPORT) {
       continue;
     }
 
@@ -926,7 +926,7 @@ static bool editmode_toggle_poll(bContext *C)
   }
 
   /* if hidden but in edit mode, we still display */
-  if ((ob->restrictflag & OB_RESTRICT_VIEWPORT) && !(ob->mode & OB_MODE_EDIT)) {
+  if ((ob->visibility_flag & OB_HIDE_VIEWPORT) && !(ob->mode & OB_MODE_EDIT)) {
     return false;
   }
 
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index fe1e850dcba..bd4c83c107e 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -273,10 +273,10 @@ static void switch_preview_collection_visibilty(ViewLayer *view_layer, const ePr
 
   for (lc = lc->layer_collections.first; lc; lc = lc->next) {
     if (STREQ(lc->collection->id.name + 2, collection_name)) {
-      lc->collection->flag &= ~COLLECTION_RESTRICT_RENDER;
+      lc->collection->flag &= ~COLLECTION_HIDE_RENDER;
     }
     else {
-      lc->collection->flag |= COLLECTION_RESTRICT_RENDER;
+      lc->collection->flag |= COLLECTION_HIDE_RENDER;
     }
   }
 }
@@ -288,10 +288,10 @@ static void switch_preview_floor_visibility(ViewLayer *view_layer,
   LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
     if (STREQ(base->object->id.name + 2, "Floor")) {
       if (pr_method == PR_ICON_RENDER) {
-        base->object->restrictflag |= OB_RESTRICT_RENDER;
+        base->object->visibility_flag |= OB_HIDE_RENDER;
       }
       else {
-        base->object->restrictflag &= ~OB_RESTRICT_RENDER;
+        base->object->visibility_flag &= ~OB_HIDE_RENDER;
       }
     }
   }
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 107466a8a0b..d8cef889a40 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -381,7 +381,7 @@ bool ED_operator_console_active(bContext *C)
 static bool ed_object_hidden(const Object *ob)
 {
   /* if hidden but in edit mode, we still display, can happen with animation */
-  return ((ob->restrictflag & OB_RESTRICT_VIEWPORT) && !(ob->mode & OB_MODE_EDIT));
+  return ((ob->visibility_flag & OB_HIDE_VIEWPORT) && !(ob->mode & OB_MODE_EDIT));
 }
 
 bool ED_operator_object_active(bContext *C)
@@ -2906,7 +2906,7 @@ static void areas_do_frame_follow(bContext *C, bool middle)
     LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
       LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
         /* do follow here if editor type supports it */
-        if ((screen_ctx->redraws_flag & TIME_FOLLOW)) {
+        if (screen_ctx->redraws_flag & TIME_FOLLOW) {
           if ((region->regiontype == RGN_TYPE_WINDOW &&
                ELEM(area->spacetype, SPACE_SEQ, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)) ||
               (area->spacetype == SPACE_CLIP && region->regiontype == RGN_TYPE_PREVIEW)) {
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c
index 771e0e1e47b..e5ca5e4defd 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -190,7 +190,7 @@ static void HC_relaxation_iteration_uv(BMEditMesh *em,
     /* This is supposed to happen only if "Pin Edges" is on,
      * since we have initialization on stroke start.
      * If ever uv brushes get their own mode we should check for toolsettings option too. */
-    if ((sculptdata->uv[i].flag & MARK_BOUNDARY)) {
+    if (sculptdata->uv[i].flag & MARK_BOUNDARY) {
       continue;
     }
 
@@ -268,7 +268,7 @@ static void laplacian_relaxation_iteration_uv(BMEditMesh *em,
     /* This is supposed to happen only if "Pin Edges" is on,
      * since we have initialization on stroke start.
      * If ever uv brushes get their own mode we should check for toolsettings option too. */
-    if ((sculptdata->uv[i].flag & MARK_BOUNDARY)) {
+    if (sculptdata->uv[i].flag & MARK_BOUNDARY) {
       continue;
     }
 
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index 7194e78e940..23dd290e13f 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -492,7 +492,7 @@ static bool mask_has_selection(const bContext *C)
   }
 
   LISTBASE_FOREACH (MaskLayer *, mask_layer, &mask->masklayers) {
-    if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (mask_layer->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
     LISTBASE_FOREACH (MaskSpline *, spline, &mask_layer->splines) {
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 2d1151c8f4d..776bb0b3bb7 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -969,7 +969,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
         BLI_join_dirfile(name, sizeof(name), xdg_runtime_dir, "gvfs/");
         const uint dir_len = BLI_filelist_dir_contents(name, &dir);
         for (uint i = 0; i < dir_len; i++) {
-          if ((dir[i].type & S_IFDIR)) {
+          if (dir[i].type & S_IFDIR) {
             const char *dirname = dir[i].relname;
             if (dirname[0] != '.') {
               /* Dir names contain a lot of unwanted text.
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 6538f5709b7..1ec1afe86fc 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -1263,22 +1263,22 @@ static bool collection_flag_poll(bContext *C, bool clear, int flag)
 
 static bool collection_enable_poll(bContext *C)
 {
-  return collection_flag_poll(C, true, COLLECTION_RESTRICT_VIEWPORT);
+  return collection_flag_poll(C, true, COLLECTION_HIDE_VIEWPORT);
 }
 
 static bool collection_disable_poll(bContext *C)
 {
-  return collection_flag_poll(C, false, COLLECTION_RESTRICT_VIEWPORT);
+  return collection_flag_poll(C, false, COLLECTION_HIDE_VIEWPORT);
 }
 
 static bool collection_enable_render_poll(bContext *C)
 {
-  return collection_flag_poll(C, true, COLLECTION_RESTRICT_RENDER);
+  return collection_flag_poll(C, true, COLLECTION_HIDE_RENDER);
 }
 
 static bool collection_disable_render_poll(bContext *C)
 {
-  return collection_flag_poll(C, false, COLLECTION_RESTRICT_RENDER);
+  return collection_flag_poll(C, false, COLLECTION_HIDE_RENDER);
 }
 
 static int collection_flag_exec(bContext *C, wmOperator *op)
@@ -1288,7 +1288,7 @@ static int collection_flag_exec(bContext *C, wmOperator *op)
   SpaceOutliner *space_outliner = CTX_wm_space_outliner(C);
   const bool is_render = strstr(op->idname, "render");
   const bool clear = strstr(op->idname, "show") || strstr(op->idname, "enable");
-  int flag = is_render ? COLLECTION_RESTRICT_RENDER : COLLECTION_RESTRICT_VIEWPORT;
+  int flag = is_render ? COLLECTION_HIDE_RENDER : COLLECTION_HIDE_VIEWPORT;
   struct CollectionEditData data = {
       .scene = scene,
       .space_outliner = space_outliner,
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 3f8dea8b533..0472e1264ce 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1139,7 +1139,7 @@ static void draw_seq_strip(const bContext *C,
   }
 
   /* Draw strip offsets when flag is enabled or during "solo preview". */
-  if ((sseq->flag & SEQ_SHOW_STRIP_OVERLAY)) {
+  if (sseq->flag & SEQ_SHOW_STRIP_OVERLAY) {
     if (!is_single_image && (seq->startofs || seq->endofs) && pixely > 0) {
       if ((sseq->draw_flag & SEQ_DRAW_OFFSET_EXT) || (seq == special_seq_update)) {
         draw_sequence_extensions_overlay(scene, seq, pos, pixely);
diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.c b/source/blender/editors/space_sequencer/sequencer_proxy.c
index 2dcc2d389d9..16d14b5fa72 100644
--- a/source/blender/editors/space_sequencer/sequencer_proxy.c
+++ b/source/blender/editors/space_sequencer/sequencer_proxy.c
@@ -131,7 +131,7 @@ static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
   file_list = BLI_gset_new(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, "file list");
 
   LISTBASE_FOREACH (Sequence *, seq, SEQ_active_seqbase_get(ed)) {
-    if ((seq->flag & SELECT)) {
+    if (seq->flag & SELECT) {
       ListBase queue = {NULL, NULL};
       LinkData *link;
       short stop = 0, do_update;
@@ -197,7 +197,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op)
   }
 
   LISTBASE_FOREACH (Sequence *, seq, SEQ_active_seqbase_get(ed)) {
-    if ((seq->flag & SELECT)) {
+    if (seq->flag & SELECT) {
       if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE)) {
         SEQ_proxy_set(seq, turnon);
         if (seq->strip->proxy == NULL) {
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c
index c5385e24d2c..a0a9cdd96b1 100644
--- a/source/blender/editors/space_sequencer/sequencer_view.c
+++ b/source/blender/editors/space_sequencer/sequencer_view.c
@@ -292,7 +292,7 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *op)
   }
 
   for (seq = ed->seqbasep->first; seq; seq = seq->next) {
-    if ((seq->flag & SELECT)) {
+    if (seq->flag & SELECT) {
       xmin = min_ii(xmin, seq->startdisp);
       xmax = max_ii(xmax, seq->enddisp);
 
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 0803b4c4776..72d0c11e192 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -534,8 +534,8 @@ static char *view3d_mat_drop_tooltip(bContext *C,
                                      const wmEvent *event,
                                      struct wmDropBox *drop)
 {
-  wmDragAsset *asset_drag = WM_drag_get_asset_data(drag, ID_MA);
-  RNA_string_set(drop->ptr, "name", asset_drag->name);
+  const char *name = WM_drag_get_item_name(drag);
+  RNA_string_set(drop->ptr, "name", name);
   return ED_object_ot_drop_named_material_tooltip(C, drop->ptr, event);
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.c b/source/blender/editors/space_view3d/view3d_navigate_walk.c
index 09936b41a74..1ac241013ed 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_walk.c
+++ b/source/blender/editors/space_view3d/view3d_navigate_walk.c
@@ -548,7 +548,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
   walk->teleport.duration = U.walk_navigation.teleport_time;
   walk->mouse_speed = U.walk_navigation.mouse_speed;
 
-  if ((U.walk_navigation.flag & USER_WALK_GRAVITY)) {
+  if (U.walk_navigation.flag & USER_WALK_GRAVITY) {
     walk_navigation_mode_set(walk, WALK_MODE_GRAVITY);
   }
   else {
@@ -563,7 +563,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
 
   walk->gravity_state = WALK_GRAVITY_STATE_OFF;
 
-  if ((walk->scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY)) {
+  if (walk->scene->physics_settings.flag & PHYS_GLOBAL_GRAVITY) {
     walk->gravity = fabsf(walk->scene->physics_settings.gravity[2]);
   }
   else {
@@ -1199,11 +1199,11 @@ static int walkApply(bContext *C, WalkInfo *walk, bool is_confirm)
 
           direction = 0;
 
-          if ((walk->active_directions & WALK_BIT_FORWARD)) {
+          if (walk->active_directions & WALK_BIT_FORWARD) {
             direction += 1;
           }
 
-          if ((walk->active_directions & WALK_BIT_BACKWARD)) {
+          if (walk->active_directions & WALK_BIT_BACKWARD) {
             direction -= 1;
           }
 
@@ -1223,11 +1223,11 @@ static int walkApply(bContext *C, WalkInfo *walk, bool is_confirm)
 
           direction = 0;
 
-          if ((walk->active_directions & WALK_BIT_LEFT)) {
+          if (walk->active_directions & WALK_BIT_LEFT) {
             direction += 1;
           }
 
-          if ((walk->active_directions & WALK_BIT_RIGHT)) {
+          if (walk->active_directions & WALK_BIT_RIGHT) {
             direction -= 1;
           }
 
@@ -1245,11 +1245,11 @@ static int walkApply(bContext *C, WalkInfo *walk, bool is_confirm)
 
             direction = 0;
 
-            if ((walk->active_directions & WALK_BIT_UP)) {
+            if (walk->active_directions & WALK_BIT_UP) {
               direction -= 1;
             }
 
-            if ((walk->active_directions & WALK_BIT_DOWN)) {
+            if (walk->active_directions & WALK_BIT_DOWN) {
               direction = 1;
             }
 
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 5ec3e9cae5a..2ce5684e874 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -2156,7 +2156,7 @@ static Base *mouse_select_eval_buffer(ViewContext *vc,
         for (a = 0; a < hits; a++) {
           if (has_bones) {
             /* skip non-bone objects */
-            if ((buffer[4 * a + 3] & 0xFFFF0000)) {
+            if (buffer[4 * a + 3] & 0xFFFF0000) {
               if (base->object->runtime.select_id == (buffer[(4 * a) + 3] & 0xFFFF)) {
                 basact = base;
               }
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index efcf7d587e1..96b84bd2a35 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1828,7 +1828,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
     if ((t->flag & T_EDIT) && t->obedit_type == OB_MESH) {
 
       FOREACH_TRANS_DATA_CONTAINER (t, tc) {
-        if ((((Mesh *)(tc->obedit->data))->flag & ME_AUTOSMOOTH)) {
+        if (((Mesh *)(tc->obedit->data))->flag & ME_AUTOSMOOTH) {
           BMEditMesh *em = NULL; /* BKE_editmesh_from_object(t->obedit); */
           bool do_skip = false;
 
diff --git a/source/blender/editors/transform/transform_convert_armature.c b/source/blender/editors/transform/transform_convert_armature.c
index 1f1b1f8db97..f56d60b7376 100644
--- a/source/blender/editors/transform/transform_convert_armature.c
+++ b/source/blender/editors/transform/transform_convert_armature.c
@@ -1515,7 +1515,7 @@ int transform_convert_pose_transflags_update(Object *ob,
   for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
     bone = pchan->bone;
     if (PBONE_VISIBLE(arm, bone)) {
-      if ((bone->flag & BONE_SELECTED)) {
+      if (bone->flag & BONE_SELECTED) {
         bone->flag |= BONE_TRANSFORM;
       }
       else {
diff --git a/source/blender/editors/transform/transform_convert_mask.c b/source/blender/editors/transform/transform_convert_mask.c
index 54df8270702..1a25cfd1efb 100644
--- a/source/blender/editors/transform/transform_convert_mask.c
+++ b/source/blender/editors/transform/transform_convert_mask.c
@@ -293,7 +293,7 @@ void createTransMaskingData(bContext *C, TransInfo *t)
   for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
     MaskSpline *spline;
 
-    if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (masklay->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
@@ -351,7 +351,7 @@ void createTransMaskingData(bContext *C, TransInfo *t)
   for (masklay = mask->masklayers.first; masklay; masklay = masklay->next) {
     MaskSpline *spline;
 
-    if (masklay->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
+    if (masklay->visibility_flag & (MASK_HIDE_VIEW | MASK_HIDE_SELECT)) {
       continue;
     }
 
diff --git a/source/blender/editors/transform/transform_snap_sequencer.c b/source/blender/editors/transform/transform_snap_sequencer.c
index a1f396eb503..6e926f36fba 100644
--- a/source/blender/editors/transform/transform_snap_sequencer.c
+++ b/source/blender/editors/transform/transform_snap_sequencer.c
@@ -141,7 +141,7 @@ static SeqCollection *query_snap_targets(const TransInfo *t, SeqCollection *snap
   const short snap_flag = SEQ_tool_settings_snap_flag_get(t->scene);
   SeqCollection *snap_targets = SEQ_collection_create(__func__);
   LISTBASE_FOREACH (Sequence *, seq, seqbase) {
-    if ((seq->flag & SELECT)) {
+    if (seq->flag & SELECT) {
       continue; /* Selected are being transformed. */
     }
     if ((seq->flag & SEQ_MUTE) && (snap_flag & SEQ_SNAP_IGNORE_MUTED)) {
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index 4c597d80534..5a82cd31112 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -3912,7 +3912,7 @@ BMLoop **ED_uvedit_selected_verts(Scene *scene, BMesh *bm, int len_max, int *r_v
       BM_ITER_ELEM (l_iter, &liter, f, BM_LOOPS_OF_FACE) {
         if (!BM_elem_flag_test(l_iter, BM_ELEM_TAG)) {
           const MLoopUV *luv = BM_ELEM_CD_GET_VOID_P(l_iter, cd_loop_uv_offset);
-          if ((luv->flag & MLOOPUV_VERTSEL)) {
+          if (luv->flag & MLOOPUV_VERTSEL) {
             BM_elem_flag_enable(l_iter->v, BM_ELEM_TAG);
 
             verts[verts_len++] = l_iter;