ClangFormat: run with ReflowComments on source/

Prepare for enabling ReflowComments.

81 files changed, 215 insertions, 217 deletions

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index cb6023e20ea..6d1ee08d5e9 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -361,7 +361,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale)
       offset += (short)(0.7f * U.widget_unit);
 
       /* If not in Action Editor mode, action-groups (and their children)
-     * must carry some offset too. */
+       * must carry some offset too. */
     }
     else if (ac->datatype != ANIMCONT_ACTION) {
       offset += (short)(0.7f * U.widget_unit);
@@ -4526,7 +4526,7 @@ static void draw_setting_widget(bAnimContext *ac,
   /* get the base icon for the setting */
   switch (setting) {
     case ACHANNEL_SETTING_VISIBLE: /* visibility eyes */
-      //icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
+      // icon = ((enabled) ? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF);
       icon = ICON_VISIBLE_IPO_OFF;
 
       if (ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE)) {
@@ -4551,13 +4551,13 @@ static void draw_setting_widget(bAnimContext *ac,
       break;
 
     case ACHANNEL_SETTING_EXPAND: /* expanded triangle */
-      //icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
+      // icon = ((enabled) ? ICON_TRIA_DOWN : ICON_TRIA_RIGHT);
       icon = ICON_TRIA_RIGHT;
       tooltip = TIP_("Make channels grouped under this channel visible");
       break;
 
     case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */
-      //icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON);
+      // icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON);
       icon = ICON_SOLO_OFF;
       tooltip = TIP_(
           "NLA Track is the only one evaluated in this animation data-block, with all others "
@@ -4568,7 +4568,7 @@ static void draw_setting_widget(bAnimContext *ac,
 
     case ACHANNEL_SETTING_PROTECT: /* protected lock */
       // TODO: what about when there's no protect needed?
-      //icon = ((enabled) ? ICON_LOCKED : ICON_UNLOCKED);
+      // icon = ((enabled) ? ICON_LOCKED : ICON_UNLOCKED);
       icon = ICON_UNLOCKED;
 
       if (ale->datatype != ALE_NLASTRIP) {
@@ -4599,7 +4599,7 @@ static void draw_setting_widget(bAnimContext *ac,
       break;
 
     case ACHANNEL_SETTING_PINNED: /* pin icon */
-      //icon = ((enabled) ? ICON_PINNED : ICON_UNPINNED);
+      // icon = ((enabled) ? ICON_PINNED : ICON_UNPINNED);
       icon = ICON_UNPINNED;
 
       if (ale->type == ANIMTYPE_NLAACTION) {
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 3d7684dcc6b..40abf8a12bb 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -550,8 +550,8 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac,
         if (prevLevel == 0) {
           break;
           /* otherwise, this level weaves into another sibling hierarchy to the previous one just
-         * finished, so skip until we get to the parent of this level
-         */
+           * finished, so skip until we get to the parent of this level
+           */
         }
         else {
           continue;
@@ -583,9 +583,10 @@ void ANIM_flush_setting_anim_channels(bAnimContext *ac,
       if (level > matchLevel) {
         ANIM_channel_setting_set(ac, ale, setting, mode);
         /* however, if the level is 'less than or equal to' the channel that was changed,
-       * (i.e. the current channel is as important if not more important than the changed channel)
-       * then we should stop, since we've found the last one of the children we should flush
-       */
+         * (i.e. the current channel is as important if not more important than the changed
+         * channel) then we should stop, since we've found the last one of the children we should
+         * flush
+         */
       }
       else {
         break;
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index d7fe326f2ee..5c9f0707aa9 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -377,7 +377,7 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
       if (ale->update & ANIM_UPDATE_ORDER) {
         ale->update &= ~ANIM_UPDATE_ORDER;
         if (gpl) {
-          //gpencil_sort_frames(gpl);
+          // gpencil_sort_frames(gpl);
         }
       }
 
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c
index d5116858970..61bf7f95340 100644
--- a/source/blender/editors/animation/anim_draw.c
+++ b/source/blender/editors/animation/anim_draw.c
@@ -169,7 +169,7 @@ void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
     immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
     immUniformThemeColorShadeAlpha(TH_ANIM_PREVIEW_RANGE, -25, -30);
     /* XXX: Fix this hardcoded color (anim_active) */
-    //immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f);
+    // immUniformColor4f(0.8f, 0.44f, 0.1f, 0.2f);
 
     /* only draw two separate 'curtains' if there's no overlap between them */
     if (PSFRA < PEFRA + end_frame_width) {
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 6a0f7d21f55..b94d0e3ada7 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -117,7 +117,7 @@ static void animedit_get_yscale_factor(bAnimContext *ac)
   if (ac->yscale_fac < 0.1f) {
     ac->yscale_fac = 1.0f;
   }
-  //printf("yscale_fac = %f\n", ac->yscale_fac);
+  // printf("yscale_fac = %f\n", ac->yscale_fac);
 }
 
 /* ----------- Private Stuff - Action Editor ------------- */
@@ -136,7 +136,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac)
   }
 
   /* XXX pinning is not available in 'ShapeKey' mode... */
-  //if (saction->pin) return NULL;
+  // if (saction->pin) return NULL;
 
   /* shapekey data is stored with geometry data */
   key = BKE_key_from_object(ob);
@@ -218,7 +218,7 @@ static bool actedit_get_context(bAnimContext *ac, SpaceAction *saction)
     {
       /* TODO, other methods to get the mask */
       // Sequence *seq = BKE_sequencer_active_get(ac->scene);
-      //MovieClip *clip = ac->scene->clip;
+      // MovieClip *clip = ac->scene->clip;
       //          struct Mask *mask = seq ? seq->mask : NULL;
 
       /* update scene-pointer (no need to check for pinning yet, as not implemented) */
@@ -1324,7 +1324,7 @@ static size_t animfilter_act_group(bAnimContext *ac,
   ListBase tmp_data = {NULL, NULL};
   size_t tmp_items = 0;
   size_t items = 0;
-  //int ofilter = filter_mode;
+  // int ofilter = filter_mode;
 
   /* if we care about the selection status of the channels,
    * but the group isn't expanded (1)...
@@ -1384,7 +1384,7 @@ static size_t animfilter_act_group(bAnimContext *ac,
     /* add this group as a channel first */
     if (filter_mode & ANIMFILTER_LIST_CHANNELS) {
       /* restore original filter mode so that this next step works ok... */
-      //filter_mode = ofilter;
+      // filter_mode = ofilter;
 
       /* filter selection of channel specially here again,
        * since may be open and not subject to previous test */
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 67beecac2c0..66cdae07a36 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -203,7 +203,7 @@ void ED_markers_get_minmax(ListBase *markers, short sel, float *first, float *la
   float min, max;
 
   /* sanity check */
-  //printf("markers = %p -  %p, %p\n", markers, markers->first, markers->last);
+  // printf("markers = %p -  %p, %p\n", markers, markers->first, markers->last);
   if (ELEM(NULL, markers, markers->first, markers->last)) {
     *first = 0.0f;
     *last = 0.0f;
diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c
index 34d7fac041f..2a8702802aa 100644
--- a/source/blender/editors/animation/drivers.c
+++ b/source/blender/editors/animation/drivers.c
@@ -1140,7 +1140,7 @@ void ANIM_OT_driver_button_remove(wmOperatorType *ot)
 
   /* callbacks */
   ot->exec = remove_driver_button_exec;
-  //op->poll = ??? // TODO: need to have some driver to be able to do this...
+  // op->poll = ??? // TODO: need to have some driver to be able to do this...
 
   /* flags */
   ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
@@ -1177,7 +1177,7 @@ void ANIM_OT_driver_button_edit(wmOperatorType *ot)
 
   /* callbacks */
   ot->exec = edit_driver_button_exec;
-  //op->poll = ??? // TODO: need to have some driver to be able to do this...
+  // op->poll = ??? // TODO: need to have some driver to be able to do this...
 
   /* flags */
   ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
@@ -1221,7 +1221,7 @@ void ANIM_OT_copy_driver_button(wmOperatorType *ot)
 
   /* callbacks */
   ot->exec = copy_driver_button_exec;
-  //op->poll = ??? // TODO: need to have some driver to be able to do this...
+  // op->poll = ??? // TODO: need to have some driver to be able to do this...
 
   /* flags */
   ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
@@ -1270,7 +1270,7 @@ void ANIM_OT_paste_driver_button(wmOperatorType *ot)
 
   /* callbacks */
   ot->exec = paste_driver_button_exec;
-  //op->poll = ??? // TODO: need to have some driver to be able to do this...
+  // op->poll = ??? // TODO: need to have some driver to be able to do this...
 
   /* flags */
   ot->flag = OPTYPE_UNDO | OPTYPE_INTERNAL;
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 3fd2e4382af..ab5e3186c47 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -377,7 +377,7 @@ void ANIM_OT_keyingset_button_add(wmOperatorType *ot)
 
   /* callbacks */
   ot->exec = add_keyingset_button_exec;
-  //op->poll = ???
+  // op->poll = ???
 
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -459,7 +459,7 @@ void ANIM_OT_keyingset_button_remove(wmOperatorType *ot)
 
   /* callbacks */
   ot->exec = remove_keyingset_button_exec;
-  //op->poll = ???
+  // op->poll = ???
 
   /* flags */
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index 97a9d854eab..a6fdd48b720 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -296,7 +296,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
       /* Get Pose of current armature */
       opose = ob_iter->pose;
       ob_iter->mode &= ~OB_MODE_POSE;
-      //BASACT->flag &= ~OB_MODE_POSE;
+      // BASACT->flag &= ~OB_MODE_POSE;
 
       /* Find the difference matrix */
       invert_m4_m4(oimat, ob_active->obmat);
@@ -612,7 +612,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
     oldob = obedit;
     oldbase = base_iter;
     oldob->mode &= ~OB_MODE_POSE;
-    //oldbase->flag &= ~OB_POSEMODE;
+    // oldbase->flag &= ~OB_POSEMODE;
 
     ED_armature_from_edit(bmain, obedit->data);
     ED_armature_edit_free(obedit->data);
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index b194650060a..81030c7f199 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -365,7 +365,7 @@ int laplacian_system_solve(LaplacianSystem *sys)
 {
   sys->variablesdone = false;
 
-  //EIG_linear_solver_print_matrix(sys->context, );
+  // EIG_linear_solver_print_matrix(sys->context, );
 
   return EIG_linear_solver_solve(sys->context);
 }
@@ -451,7 +451,7 @@ static void heat_ray_tree_create(LaplacianSystem *sys)
 
     BLI_bvhtree_insert(sys->heat.bvhtree, a, bb, 2);
 
-    //Setup inverse pointers to use on isect.orig
+    // Setup inverse pointers to use on isect.orig
     sys->heat.vltree[vtri[0]] = lt;
     sys->heat.vltree[vtri[1]] = lt;
     sys->heat.vltree[vtri[2]] = lt;
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c
index 65e1c82e0bf..7b31897766d 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -1455,7 +1455,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, con
       case PADMINUS:
       case MIDDLEMOUSE:
       case MOUSEMOVE:
-        //pld->redraw = PL_PREVIEW_REDRAWHEADER;
+        // pld->redraw = PL_PREVIEW_REDRAWHEADER;
         ret = OPERATOR_PASS_THROUGH;
         break;
 
@@ -1587,7 +1587,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, con
      */
     case MIDDLEMOUSE:
     case MOUSEMOVE:
-      //pld->redraw = PL_PREVIEW_REDRAWHEADER;
+      // pld->redraw = PL_PREVIEW_REDRAWHEADER;
       ret = OPERATOR_PASS_THROUGH;
       break;
 
@@ -1610,7 +1610,7 @@ static int poselib_preview_handle_event(bContext *UNUSED(C), wmOperator *op, con
       }
       else {
         /* view manipulation (see above) */
-        //pld->redraw = PL_PREVIEW_REDRAWHEADER;
+        // pld->redraw = PL_PREVIEW_REDRAWHEADER;
         ret = OPERATOR_PASS_THROUGH;
       }
       break;
@@ -1748,7 +1748,7 @@ static void poselib_preview_cleanup(bContext *C, wmOperator *op)
 
     /* updates */
     if (IS_AUTOKEY_MODE(scene, NORMAL)) {
-      //remake_action_ipos(ob->action);
+      // remake_action_ipos(ob->action);
     }
     else {
       BKE_pose_where_is(CTX_data_depsgraph(C), scene, ob);
diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c
index fcfb61bb3a4..a984691064a 100644
--- a/source/blender/editors/armature/pose_slide.c
+++ b/source/blender/editors/armature/pose_slide.c
@@ -510,7 +510,7 @@ static void pose_slide_apply_props(tPoseSlideOp *pso,
 
           default:
             /* cannot handle */
-            //printf("Cannot Pose Slide non-numerical property\n");
+            // printf("Cannot Pose Slide non-numerical property\n");
             break;
         }
       }
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c
index 45c51897cbf..c94ada2942a 100644
--- a/source/blender/editors/armature/pose_utils.c
+++ b/source/blender/editors/armature/pose_utils.c
@@ -342,7 +342,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, ListBase *pfLinks,
   FOREACH_OBJECT_IN_MODE_BEGIN (view_layer, v3d, OB_ARMATURE, OB_MODE_POSE, ob) {
     if (ob->id.tag & LIB_TAG_DOIT) {
       if (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) {
-        //ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear
+        // ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear
         ED_pose_recalculate_paths(C, scene, ob, false);
       }
     }
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 7babbadb205..73230e5fb0e 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -285,17 +285,17 @@ static bool gp_stroke_filtermval(tGPsdata *p, const float mval[2], float pmval[2
     return true;
 
     /* check if mouse moved at least certain distance on both axes (best case)
-   * - aims to eliminate some jitter-noise from input when trying to draw straight lines freehand
-   */
+     * - aims to eliminate some jitter-noise from input when trying to draw straight lines freehand
+     */
   }
   else if ((dx > MIN_MANHATTEN_PX) && (dy > MIN_MANHATTEN_PX)) {
     return true;
 
     /* Check if the distance since the last point is significant enough:
-   * - Prevents points being added too densely
-   * - Distance here doesn't use sqrt to prevent slowness.
-   *   We should still be safe from overflows though.
-   */
+     * - Prevents points being added too densely
+     * - Distance here doesn't use sqrt to prevent slowness.
+     *   We should still be safe from overflows though.
+     */
   }
   else if ((dx * dx + dy * dy) > MIN_EUCLIDEAN_PX * MIN_EUCLIDEAN_PX) {
     return true;
@@ -1361,7 +1361,7 @@ static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode, Deps
 
     if (has_layer_to_erase == false) {
       p->status = GP_STATUS_CAPTURE;
-      //if (G.debug & G_DEBUG)
+      // if (G.debug & G_DEBUG)
       printf("Error: Eraser will not be affecting anything (gpencil_paint_init)\n");
       return;
     }
@@ -1544,14 +1544,13 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
     immUniform1f("dash_width", 12.0f);
     immUniform1f("dash_factor", 0.5f);
 
-    imm_draw_circle_wire_2d(
-        shdr_pos,
-        x,
-        y,
-        p->radius,
-        /* XXX Dashed shader gives bad results with sets of small segments currently,
-         *     temp hack around the issue. :( */
-        max_ii(8, p->radius / 2)); /* was fixed 40 */
+    imm_draw_circle_wire_2d(shdr_pos,
+                            x,
+                            y,
+                            p->radius,
+                            /* XXX Dashed shader gives bad results with sets of small segments
+                             * currently, temp hack around the issue. :( */
+                            max_ii(8, p->radius / 2)); /* was fixed 40 */
 
     immUnbindProgram();
 
@@ -2234,7 +2233,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
     }
   }
 
-  //printf("\tGP - handle modal event...\n");
+  // printf("\tGP - handle modal event...\n");
 
   /* Exit painting mode (and/or end current stroke)
    *
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 76e13ec4eb5..ef74aa28b63 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -919,7 +919,7 @@ static void gp_draw_strokes(tGPDdraw *tgpw)
       }
 
       /* 3D Fill */
-      //if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
+      // if ((dflag & GP_DRAWDATA_FILL) && (gps->totpoints >= 3)) {
       if ((gps->totpoints >= 3) && (tgpw->disable_fill != 1)) {
         /* set color using material, tint color and opacity */
         interp_v3_v3v3(tfill, gp_style->fill_rgba, tgpw->tintcolor, tgpw->tintcolor[3]);
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 8225e9bae78..9777a8190c1 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -1326,7 +1326,7 @@ static bool gpsculpt_brush_init(bContext *C, wmOperator *op)
   gpsculpt_brush_header_set(C, gso);
 
   /* setup cursor drawing */
-  //WM_cursor_modal_set(CTX_wm_window(C), BC_CROSSCURSOR);
+  // WM_cursor_modal_set(CTX_wm_window(C), BC_CROSSCURSOR);
   if (gso->sa->spacetype != SPACE_VIEW3D) {
     ED_gpencil_toggle_brush_cursor(C, true, NULL);
   }
@@ -2007,7 +2007,7 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
 
       /* Painting mbut release = Stop painting (back to idle) */
       case LEFTMOUSE:
-        //BLI_assert(event->val == KM_RELEASE);
+        // BLI_assert(event->val == KM_RELEASE);
         if (is_modal) {
           /* go back to idling... */
           gso->is_painting = false;
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 7b65a51e8a9..463c2144276 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -619,7 +619,7 @@ static void gp_duplicate_points(const bGPDstroke *gps,
       else if (i == gps->totpoints - 1) {
         len = i - start_idx + 1;
       }
-      //printf("copying from %d to %d = %d\n", start_idx, i, len);
+      // printf("copying from %d to %d = %d\n", start_idx, i, len);
 
       /* make copies of the relevant data */
       if (len) {
@@ -1212,7 +1212,7 @@ void GPENCIL_OT_copy(wmOperatorType *ot)
   ot->poll = gp_stroke_edit_poll;
 
   /* flags */
-  //ot->flag = OPTYPE_REGISTER;
+  // ot->flag = OPTYPE_REGISTER;
 }
 
 /* --------------------- */
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 616db4b73f7..96f405fab2f 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -455,7 +455,7 @@ static void get_pixel(const ImBuf *ibuf, const int idx, float r_col[4])
 /* set pixel data (rgba) at index */
 static void set_pixel(ImBuf *ibuf, int idx, const float col[4])
 {
-  //BLI_assert(idx <= ibuf->x * ibuf->y);
+  // BLI_assert(idx <= ibuf->x * ibuf->y);
   if (ibuf->rect) {
     uint *rrect = &ibuf->rect[idx];
     uchar ccol[4];
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 21ddfc3cd13..b1b29356060 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -372,10 +372,10 @@ static bool gp_stroke_filtermval(tGPsdata *p, const float mval[2], float mvalo[2
     return true;
 
     /* Check if the distance since the last point is significant enough:
-   * - Prevents points being added too densely
-   * - Distance here doesn't use sqrt to prevent slowness.
-   *   We should still be safe from overflows though.
-   */
+     * - Prevents points being added too densely
+     * - Distance here doesn't use sqrt to prevent slowness.
+     *   We should still be safe from overflows though.
+     */
   }
   else if ((dx * dx + dy * dy) > MIN_EUCLIDEAN_PX * MIN_EUCLIDEAN_PX) {
     return true;
@@ -2319,14 +2319,13 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
     immUniform1f("dash_width", 12.0f);
     immUniform1f("dash_factor", 0.5f);
 
-    imm_draw_circle_wire_2d(
-        shdr_pos,
-        x,
-        y,
-        p->radius,
-        /* XXX Dashed shader gives bad results with sets of small segments currently,
-         *     temp hack around the issue. :( */
-        max_ii(8, p->radius / 2)); /* was fixed 40 */
+    imm_draw_circle_wire_2d(shdr_pos,
+                            x,
+                            y,
+                            p->radius,
+                            /* XXX Dashed shader gives bad results with sets of small segments
+                             * currently, temp hack around the issue. :( */
+                            max_ii(8, p->radius / 2)); /* was fixed 40 */
 
     immUnbindProgram();
 
@@ -3508,7 +3507,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
     }
   }
 
-  //printf("\tGP - handle modal event...\n");
+  // printf("\tGP - handle modal event...\n");
 
   /* Exit painting mode (and/or end current stroke).
    *
diff --git a/source/blender/editors/gpencil/gpencil_undo.c b/source/blender/editors/gpencil/gpencil_undo.c
index bf077d528dd..7b57dacd3e4 100644
--- a/source/blender/editors/gpencil/gpencil_undo.c
+++ b/source/blender/editors/gpencil/gpencil_undo.c
@@ -68,7 +68,7 @@ int ED_undo_gpencil_step(bContext *C, int step, const char *name)
   gpd_ptr = ED_gpencil_data_get_pointers(C, NULL);
 
   if (step == 1) { /* undo */
-    //printf("\t\tGP - undo step\n");
+    // printf("\t\tGP - undo step\n");
     if (cur_node->prev) {
       if (!name || STREQ(cur_node->name, name)) {
         cur_node = cur_node->prev;
@@ -77,7 +77,7 @@ int ED_undo_gpencil_step(bContext *C, int step, const char *name)
     }
   }
   else if (step == -1) {
-    //printf("\t\tGP - redo step\n");
+    // printf("\t\tGP - redo step\n");
     if (cur_node->next) {
       if (!name || STREQ(cur_node->name, name)) {
         cur_node = cur_node->next;
@@ -134,7 +134,7 @@ void gpencil_undo_push(bGPdata *gpd)
 {
   bGPundonode *undo_node;
 
-  //printf("\t\tGP - undo push\n");
+  // printf("\t\tGP - undo push\n");
 
   if (cur_node) {
     /* remove all un-done nodes from stack */
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 0d920641c5d..129bd01574c 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1689,14 +1689,13 @@ void ED_gpencil_brush_draw_eraser(Brush *brush, int x, int y)
   immUniform1f("dash_width", 12.0f);
   immUniform1f("dash_factor", 0.5f);
 
-  imm_draw_circle_wire_2d(
-      shdr_pos,
-      x,
-      y,
-      radius,
-      /* XXX Dashed shader gives bad results with sets of small segments currently,
-       *     temp hack around the issue. :( */
-      max_ii(8, radius / 2)); /* was fixed 40 */
+  imm_draw_circle_wire_2d(shdr_pos,
+                          x,
+                          y,
+                          radius,
+                          /* XXX Dashed shader gives bad results with sets of small segments
+                           * currently, temp hack around the issue. :( */
+                          max_ii(8, radius / 2)); /* was fixed 40 */
 
   immUnbindProgram();
 
@@ -2514,7 +2513,7 @@ void ED_gpencil_select_toggle_all(bContext *C, int action)
           case SEL_SELECT:
             pt->flag |= GP_SPOINT_SELECT;
             break;
-          //case SEL_DESELECT:
+          // case SEL_DESELECT:
           //  pt->flag &= ~GP_SPOINT_SELECT;
           //  break;
           case SEL_INVERT:
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index a5abbb2b86f..42f4b4495c3 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1299,10 +1299,10 @@ static bool ui_but_event_property_operator_string(const bContext *C,
         }
       }
       else {
-        //puts("other id");
+        // puts("other id");
       }
 
-      //printf("prop shortcut: '%s' (%s)\n", RNA_property_identifier(prop), data_path);
+      // printf("prop shortcut: '%s' (%s)\n", RNA_property_identifier(prop), data_path);
     }
 
     /* we have a datapath! */
@@ -1615,7 +1615,7 @@ void ui_fontscale(short *points, float aspect)
 
     /* for some reason scaling fonts goes too fast compared to widget size */
     /* XXX not true anymore? (ton) */
-    //aspect = sqrt(aspect);
+    // aspect = sqrt(aspect);
     pointsf /= aspect;
 
     if (aspect > 1.0f) {
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 608ef69c4cc..8f19f40d1c0 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3797,7 +3797,7 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 #endif
 
   /* this makes adjacent blocks auto open from now on */
-  //if (but->block->auto_open == 0) {
+  // if (but->block->auto_open == 0) {
   //  but->block->auto_open = 1;
   //}
 }
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 935d89937e0..41001ff6d14 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -840,7 +840,7 @@ static void ui_item_enum_expand_exec(uiLayout *layout,
       /* Separate items, potentially with a label. */
       if (next_item->identifier) {
         /* Item without identifier but with name:
-        * Add group label for the following items. */
+         * Add group label for the following items. */
         if (item->name) {
           if (!is_first) {
             uiItemS(block->curlayout);
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index ae28c09b7e2..87e58a4b3b5 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -701,11 +701,10 @@ void ui_draw_aligned_panel(uiStyle *style,
   const bool is_closed_x = (panel->flag & PNL_CLOSEDX) ? true : false;
   const bool is_closed_y = (panel->flag & PNL_CLOSEDY) ? true : false;
   const bool is_subpanel = (panel->type && panel->type->parent);
-  const bool show_drag =
-      (!is_subpanel &&
-       /* FIXME(campbell): currently no background means floating panel which can't be dragged.
-        * This may be changed in future. */
-       show_background);
+  const bool show_drag = (!is_subpanel &&
+                          /* FIXME(campbell): currently no background means floating panel which
+                           * can't be dragged. This may be changed in future. */
+                          show_background);
 
   if (panel->paneltab) {
     return;
@@ -1672,7 +1671,7 @@ static void ui_handle_panel_header(
     if (mx <= block->rect.xmax - 8 - PNL_ICON) {
       button = 2;
     }
-    //else if (mx <= block->rect.xmin + 10 + 2 * PNL_ICON + 2) {
+    // else if (mx <= block->rect.xmin + 10 + 2 * PNL_ICON + 2) {
     //  button = 1;
     //}
   }
@@ -2064,7 +2063,7 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 
   BLF_enable(fontid, BLF_ROTATION);
   BLF_rotation(fontid, M_PI_2);
-  //UI_fontstyle_set(&style->widget);
+  // UI_fontstyle_set(&style->widget);
   ui_fontscale(&fstyle_points, aspect / (U.pixelsize * 1.1f));
   BLF_size(fontid, fstyle_points, U.dpi);
 
@@ -2569,7 +2568,7 @@ static void panel_activate_state(const bContext *C, Panel *pa, uiHandlePanelStat
        *   is very hard to control and use, and has no real benefit." - BillRey
        * Aligorith, 2009Sep
        */
-      //test_add_new_tabs(ar);   // also copies locations of tabs in dragged panel
+      // test_add_new_tabs(ar);   // also copies locations of tabs in dragged panel
       check_panel_overlap(ar, NULL); /* clears */
     }
 
diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c
index 930f9e3fe1f..251bc86a3f5 100644
--- a/source/blender/editors/interface/interface_region_search.c
+++ b/source/blender/editors/interface/interface_region_search.c
@@ -598,7 +598,7 @@ ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiBut *but
 
     winx = WM_window_pixels_x(win);
     // winy = WM_window_pixels_y(win);  /* UNUSED */
-    //wm_window_get_size(win, &winx, &winy);
+    // wm_window_get_size(win, &winx, &winy);
 
     if (rect_i.xmax > winx) {
       /* super size */
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 017b7dea352..4a9c7b689c1 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -1063,7 +1063,7 @@ static ARegion *ui_tooltip_create_with_data(bContext *C,
     field->geom.x_pos = x_pos;
   }
 
-  //fontw *= aspect;
+  // fontw *= aspect;
 
   BLF_disable(data->fstyle.uifont_id, font_flag);
   BLF_disable(blf_mono_font, font_flag);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 52c1390a2fd..f656e917c44 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -798,7 +798,7 @@ static void template_ID(bContext *C,
     char name[UI_MAX_NAME_STR];
     const bool user_alert = (id->us <= 0);
 
-    //text_idbutton(id, name);
+    // text_idbutton(id, name);
     name[0] = '\0';
     but = uiDefButR(block,
                     UI_BTYPE_TEXT,
@@ -4997,7 +4997,7 @@ static void uilist_filter_items_default(struct uiList *ui_list,
             dyn_data->items_shown++;
             do_order = order_by_name;
           }
-          //printf("%s: '%s' matches '%s'\n", __func__, name, filter);
+          // printf("%s: '%s' matches '%s'\n", __func__, name, filter);
         }
         else if (filter_exclude) {
           dyn_data->items_shown++;
@@ -5321,16 +5321,16 @@ void uiTemplateList(uiLayout *layout,
       dyn_data->items_len = dyn_data->items_shown = RNA_property_collection_length(dataptr, prop);
     }
     else {
-      //printf("%s: filtering...\n", __func__);
+      // printf("%s: filtering...\n", __func__);
       filter_items(ui_list, C, dataptr, propname);
-      //printf("%s: filtering done.\n", __func__);
+      // printf("%s: filtering done.\n", __func__);
     }
 
     items_shown = dyn_data->items_shown;
     if (items_shown >= 0) {
       bool activei_mapping_pending = true;
       items_ptr = MEM_mallocN(sizeof(_uilist_item) * items_shown, __func__);
-      //printf("%s: items shown: %d.\n", __func__, items_shown);
+      // printf("%s: items shown: %d.\n", __func__, items_shown);
       RNA_PROP_BEGIN (dataptr, itemptr, prop) {
         if (!dyn_data->items_filter_flags ||
             ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude)) {
@@ -5342,7 +5342,7 @@ void uiTemplateList(uiLayout *layout,
           else {
             ii = order_reverse ? items_shown - ++idx : idx++;
           }
-          //printf("%s: ii: %d\n", __func__, ii);
+          // printf("%s: ii: %d\n", __func__, ii);
           items_ptr[ii].item = itemptr;
           items_ptr[ii].org_idx = i;
           items_ptr[ii].flt_flag = dyn_data->items_filter_flags ? dyn_data->items_filter_flags[i] :
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 32ec7910b36..a9cd2f9cee1 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2787,8 +2787,8 @@ static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int dir
 
   /* menu is 2nd level or deeper */
   if (flag & UI_BLOCK_POPUP) {
-    //rect->ymin -= 4.0;
-    //rect->ymax += 4.0;
+    // rect->ymin -= 4.0;
+    // rect->ymax += 4.0;
   }
   else if (direction == UI_DIR_DOWN) {
     roundboxalign = (UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT);
@@ -4686,7 +4686,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
   }
 
   if (wt) {
-    //rcti disablerect = *rect; /* rect gets clipped smaller for text */
+    // rcti disablerect = *rect; /* rect gets clipped smaller for text */
     int roundboxalign, state, drawflag;
     bool disabled = false;
 
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index bfbd3722142..9796bf89cf3 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -174,7 +174,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
   /* get editmode results */
   ED_object_editmode_load(bmain, CTX_data_edit_object(C));
 
-  //Scene *scene = CTX_data_scene(C);
+  // Scene *scene = CTX_data_scene(C);
 
   ExportSettings export_settings;
 
@@ -748,7 +748,7 @@ void WM_OT_collada_import(wmOperatorType *ot)
   ot->exec = wm_collada_import_exec;
   ot->poll = WM_operator_winactive;
 
-  //ot->flag |= OPTYPE_PRESET;
+  // ot->flag |= OPTYPE_PRESET;
 
   ot->ui = wm_collada_import_draw;
 
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index ab774fa13df..c0f3b1f8338 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -245,7 +245,7 @@ bool ED_mask_feather_find_nearest(const bContext *C,
     MaskSpline *spline;
 
     for (spline = masklay->splines.first; spline; spline = spline->next) {
-      //MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
+      // MaskSplinePoint *points_array = BKE_mask_spline_point_array(spline);
 
       int i, tot_feather_point;
       float(*feather_points)[2], (*fp)[2];
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
index bb9359bad71..75b2aee3570 100644
--- a/source/blender/editors/mask/mask_relationships.c
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -184,7 +184,7 @@ void MASK_OT_parent_set(wmOperatorType *ot)
   ot->idname = "MASK_OT_parent_set";
 
   /* api callbacks */
-  //ot->invoke = mask_parent_set_invoke;
+  // ot->invoke = mask_parent_set_invoke;
   ot->exec = mask_parent_set_exec;
 
   ot->poll = ED_space_clip_maskedit_mask_poll;
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index 9314b96afee..82cff8363f8 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -440,7 +440,7 @@ void MESH_OT_extrude_region(wmOperatorType *ot)
   ot->description = "Extrude region of faces";
 
   /* api callbacks */
-  //ot->invoke = mesh_extrude_region_invoke;
+  // ot->invoke = mesh_extrude_region_invoke;
   ot->exec = edbm_extrude_region_exec;
   ot->poll = ED_operator_editmesh;
 
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index cd5281e1273..cc0c2f5bbe4 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -157,7 +157,7 @@ typedef struct KnifeTool_OpData {
   void *draw_handle; /* for drawing preview loop */
   ViewContext vc;    /* note: _don't_ use 'mval', instead use the one we define below */
   float mval[2];     /* mouse value with snapping applied */
-  //bContext *C;
+  // bContext *C;
 
   Scene *scene;
   Object *ob;
diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index 062008cd656..f8ec4334427 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -434,12 +434,12 @@ static bool facetag_filter_cb(BMFace *f, void *UNUSED(user_data_v))
 {
   return !BM_elem_flag_test(f, BM_ELEM_HIDDEN);
 }
-//static bool facetag_test_cb(Scene *UNUSED(scene), BMesh *UNUSED(bm), BMFace *f)
+// static bool facetag_test_cb(Scene *UNUSED(scene), BMesh *UNUSED(bm), BMFace *f)
 static bool facetag_test_cb(BMFace *f, void *UNUSED(user_data_v))
 {
   return BM_elem_flag_test_bool(f, BM_ELEM_SELECT);
 }
-//static void facetag_set_cb(BMesh *bm, Scene *UNUSED(scene), BMFace *f, const bool val)
+// static void facetag_set_cb(BMesh *bm, Scene *UNUSED(scene), BMFace *f, const bool val)
 static void facetag_set_cb(BMFace *f, bool val, void *user_data_v)
 {
   struct UserData *user_data = user_data_v;
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index fcca91d4167..2d6be5a063f 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2774,7 +2774,7 @@ void MESH_OT_uvs_reverse(wmOperatorType *ot)
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
   /* props */
-  //RNA_def_enum(ot->srna, "axis", axis_items, DIRECTION_CW, "Axis", "Axis to mirror UVs around");
+  // RNA_def_enum(ot->srna, "axis", axis_items, DIRECTION_CW, "Axis", "Axis to mirror UVs around");
 }
 
 void MESH_OT_colors_rotate(wmOperatorType *ot)
@@ -3573,7 +3573,7 @@ static float bm_edge_seg_isect(const float sco_a[2],
   float threshold = 0.0;
   int i;
 
-  //threshold = 0.000001; /* tolerance for vertex intersection */
+  // threshold = 0.000001; /* tolerance for vertex intersection */
   // XXX threshold = scene->toolsettings->select_thresh / 100;
 
   /* Get screen coords of verts */
@@ -3715,7 +3715,7 @@ static float bm_edge_seg_isect(const float sco_a[2],
         else {
           perc = (yi - y21) / (y22 - y21); /* lower slope more accurate */
         }
-        //isect = 32768.0 * (perc + 0.0000153); /* Percentage in 1 / 32768ths */
+        // isect = 32768.0 * (perc + 0.0000153); /* Percentage in 1 / 32768ths */
 
         break;
       }
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 6e2f0dba969..70a9870e6ae 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -382,7 +382,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
     bkr.number_of_rays = scene->r.bake_samples;
     bkr.threads = BKE_scene_num_threads(scene);
     bkr.user_scale = (scene->r.bake_flag & R_BAKE_USERSCALE) ? scene->r.bake_user_scale : -1.0f;
-    //bkr.reports= op->reports;
+    // bkr.reports= op->reports;
 
     /* create low-resolution DM (to bake to) and hi-resolution DM (to bake from) */
     bkr.ob_image.array = bake_object_image_get_array(ob);
@@ -427,7 +427,7 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj)
   bkj->number_of_rays = scene->r.bake_samples;
   bkj->threads = BKE_scene_num_threads(scene);
   bkj->user_scale = (scene->r.bake_flag & R_BAKE_USERSCALE) ? scene->r.bake_user_scale : -1.0f;
-  //bkj->reports = op->reports;
+  // bkj->reports = op->reports;
 
   CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases) {
     MultiresBakerJobData *data;
@@ -484,7 +484,7 @@ static void multiresbake_startjob(void *bkv, short *stop, short *do_update, floa
     bkr.mode = bkj->mode;
     bkr.use_lores_mesh = bkj->use_lores_mesh;
     bkr.user_scale = bkj->user_scale;
-    //bkr.reports = bkj->reports;
+    // bkr.reports = bkj->reports;
     bkr.ob_image.array = data->ob_image.array;
     bkr.ob_image.len = data->ob_image.len;
 
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 85801dbdd0a..5ae757cac56 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -386,7 +386,7 @@ static bool write_external_bake_pixels(const char *filepath,
 #ifndef WIN32
     chmod(filepath, S_IRUSR | S_IWUSR);
 #endif
-    //printf("%s saving bake map: '%s'\n", __func__, filepath);
+    // printf("%s saving bake map: '%s'\n", __func__, filepath);
   }
 
   /* garbage collection */
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 95737453777..4bd6e8b3fa7 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1420,7 +1420,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot)
   /* api callbacks */
   ot->exec = object_mode_set_exec;
 
-  ot->poll = object_mode_set_poll;  //ED_operator_object_active_editable;
+  ot->poll = object_mode_set_poll;  // ED_operator_object_active_editable;
 
   /* flags */
   ot->flag = 0; /* no register/undo here, leave it to operators being called */
@@ -1446,7 +1446,7 @@ void OBJECT_OT_mode_set_or_submode(wmOperatorType *ot)
   /* api callbacks */
   ot->exec = object_mode_set_exec;
 
-  ot->poll = object_mode_set_poll;  //ED_operator_object_active_editable;
+  ot->poll = object_mode_set_poll;  // ED_operator_object_active_editable;
 
   /* flags */
   ot->flag = 0; /* no register/undo here, leave it to operators being called */
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index c1205635a96..c939cb0a61d 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -489,7 +489,7 @@ static bool hook_op_edit_poll(bContext *C)
     if (ED_operator_editlattice(C)) {
       return 1;
     }
-    //if (ED_operator_editmball(C)) return 1;
+    // if (ED_operator_editmball(C)) return 1;
   }
 
   return 0;
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 231b3e144ca..e555f0d940d 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -2210,8 +2210,8 @@ static void oceanbake_free(void *customdata)
 /* called by oceanbake, only to check job 'stop' value */
 static int oceanbake_breakjob(void *UNUSED(customdata))
 {
-  //OceanBakeJob *ob = (OceanBakeJob *)customdata;
-  //return *(ob->stop);
+  // OceanBakeJob *ob = (OceanBakeJob *)customdata;
+  // return *(ob->stop);
 
   /* this is not nice yet, need to make the jobs list template better
    * for identifying/acting upon various different jobs */
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 2568db4abe9..afdda8d6b7f 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -655,8 +655,8 @@ static int object_select_linked_exec(bContext *C, wmOperator *op)
 
   if (nr == OBJECT_SELECT_LINKED_IPO) {
     // XXX old animation system
-    //if (ob->ipo == 0) return OPERATOR_CANCELLED;
-    //object_select_all_by_ipo(C, ob->ipo)
+    // if (ob->ipo == 0) return OPERATOR_CANCELLED;
+    // object_select_all_by_ipo(C, ob->ipo)
     return OPERATOR_CANCELLED;
   }
   else if (nr == OBJECT_SELECT_LINKED_OBDATA) {
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 9e1ef96ab93..8836d913475 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -1298,7 +1298,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
         ignore_parent_tx(C, bmain, scene, ob);
 
         /* other users? */
-        //CTX_DATA_BEGIN (C, Object *, ob_other, selected_editable_objects)
+        // CTX_DATA_BEGIN (C, Object *, ob_other, selected_editable_objects)
         //{
 
         /* use existing context looper */
@@ -1324,7 +1324,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
             ignore_parent_tx(C, bmain, scene, ob_other);
           }
         }
-        //CTX_DATA_END;
+        // CTX_DATA_END;
       }
     }
   }
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index d43ec578478..05a3d86a23c 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1299,7 +1299,7 @@ static void getVerticalAndHorizontalChange(const float norm[3],
   dists[index] = dot_v3v3(norm, end) + d;
   /* vertical change */
   changes[index][0] = dists[index] - distToStart;
-  //printf("vc %f %f\n", distance(end, projB, 3) - distance(start, projA, 3), changes[index][0]);
+  // printf("vc %f %f\n", distance(end, projB, 3) - distance(start, projA, 3), changes[index][0]);
   /* horizontal change */
   changes[index][1] = len_v3v3(projA, projB);
 }
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 52be2c6eff4..dc634865a0a 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -371,7 +371,7 @@ void PE_hide_keys_time(Scene *scene, PTCacheEdit *edit, float cfra)
         }
         else {
           key->flag |= PEK_HIDE;
-          //key->flag &= ~PEK_SELECT;
+          // key->flag &= ~PEK_SELECT;
         }
       }
     }
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 314775d090b..0737218eea4 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -759,9 +759,9 @@ static bool project_paint_PickColor(const ProjPaintState *ps,
     }
   }
   else {
-    //xi = (int)((uv[0]*ibuf->x) + 0.5f);
-    //yi = (int)((uv[1]*ibuf->y) + 0.5f);
-    //if (xi < 0 || xi >= ibuf->x  ||  yi < 0 || yi >= ibuf->y) return 0;
+    // xi = (int)((uv[0]*ibuf->x) + 0.5f);
+    // yi = (int)((uv[1]*ibuf->y) + 0.5f);
+    // if (xi < 0 || xi >= ibuf->x  ||  yi < 0 || yi >= ibuf->y) return 0;
 
     /* wrap */
     xi = mod_i((int)(uv[0] * ibuf->x), ibuf->x);
@@ -1888,7 +1888,7 @@ static ProjPixel *project_paint_uvpixel_init(const ProjPaintState *ps,
 
   x_round = x_tile * IMAPAINT_TILE_SIZE;
   y_round = y_tile * IMAPAINT_TILE_SIZE;
-  //memset(projPixel, 0, size);
+  // memset(projPixel, 0, size);
 
   tile_offset = (x_px - x_round) + (y_px - y_round) * IMAPAINT_TILE_SIZE;
   tile_index = project_paint_undo_subtiles(tinf, x_tile, y_tile);
@@ -2227,7 +2227,7 @@ static void scale_tri(float insetCos[3][3], const float *origCos[4], const float
   add_v3_v3(insetCos[1], cent);
   add_v3_v3(insetCos[2], cent);
 }
-#endif  //PROJ_DEBUG_NOSEAMBLEED
+#endif  // PROJ_DEBUG_NOSEAMBLEED
 
 static float len_squared_v2v2_alt(const float v1[2], const float v2_1, const float v2_2)
 {
@@ -2329,17 +2329,17 @@ static void rect_to_uvspace_ortho(const rctf *bucket_bounds,
   barycentric_weights_v2(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 3 : 0], uv1co, uv2co, uv3co, w);
 
-  //uv[0] = bucket_bounds->xmax; // set above
+  // uv[0] = bucket_bounds->xmax; // set above
   uv[1] = bucket_bounds->ymax;
   barycentric_weights_v2(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 2 : 1], uv1co, uv2co, uv3co, w);
 
   uv[0] = bucket_bounds->xmin;
-  //uv[1] = bucket_bounds->ymax; // set above
+  // uv[1] = bucket_bounds->ymax; // set above
   barycentric_weights_v2(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 1 : 2], uv1co, uv2co, uv3co, w);
 
-  //uv[0] = bucket_bounds->xmin; // set above
+  // uv[0] = bucket_bounds->xmin; // set above
   uv[1] = bucket_bounds->ymin;
   barycentric_weights_v2(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 0 : 3], uv1co, uv2co, uv3co, w);
@@ -2365,17 +2365,17 @@ static void rect_to_uvspace_persp(const rctf *bucket_bounds,
   barycentric_weights_v2_persp(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 3 : 0], uv1co, uv2co, uv3co, w);
 
-  //uv[0] = bucket_bounds->xmax; // set above
+  // uv[0] = bucket_bounds->xmax; // set above
   uv[1] = bucket_bounds->ymax;
   barycentric_weights_v2_persp(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 2 : 1], uv1co, uv2co, uv3co, w);
 
   uv[0] = bucket_bounds->xmin;
-  //uv[1] = bucket_bounds->ymax; // set above
+  // uv[1] = bucket_bounds->ymax; // set above
   barycentric_weights_v2_persp(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 1 : 2], uv1co, uv2co, uv3co, w);
 
-  //uv[0] = bucket_bounds->xmin; // set above
+  // uv[0] = bucket_bounds->xmin; // set above
   uv[1] = bucket_bounds->ymin;
   barycentric_weights_v2_persp(v1coSS, v2coSS, v3coSS, uv, w);
   interp_v2_v2v2v2(bucket_bounds_uv[flip ? 0 : 3], uv1co, uv2co, uv3co, w);
@@ -3093,13 +3093,13 @@ static void project_paint_face_init(const ProjPaintState *ps,
 
       has_isect = 0;
       for (y = bounds_px.ymin; y < bounds_px.ymax; y++) {
-        //uv[1] = (((float)y) + 0.5f) / (float)ibuf->y;
+        // uv[1] = (((float)y) + 0.5f) / (float)ibuf->y;
         /* use pixel offset UV coords instead */
         uv[1] = (float)y / ibuf_yf;
 
         has_x_isect = 0;
         for (x = bounds_px.xmin; x < bounds_px.xmax; x++) {
-          //uv[0] = (((float)x) + 0.5f) / ibuf->x;
+          // uv[0] = (((float)x) + 0.5f) / ibuf->x;
           /* use pixel offset UV coords instead */
           uv[0] = (float)x / ibuf_xf;
 
@@ -3134,7 +3134,7 @@ static void project_paint_face_init(const ProjPaintState *ps,
 
             /* Is this UV visible from the view? - raytrace */
             /* project_paint_PickFace is less complex, use for testing */
-            //if (project_paint_PickFace(ps, pixelScreenCo, w, &side) == tri_index) {
+            // if (project_paint_PickFace(ps, pixelScreenCo, w, &side) == tri_index) {
             if ((ps->do_occlude == false) ||
                 !project_bucket_point_occluded(ps, bucketFaceNodes, tri_index, pixelScreenCo)) {
               mask = project_paint_uvpixel_mask(ps, tri_index, w);
@@ -3307,7 +3307,7 @@ static void project_paint_face_init(const ProjPaintState *ps,
                 for (x = bounds_px.xmin; x < bounds_px.xmax; x++) {
                   float puv[2] = {(float)x, (float)y};
                   bool in_bounds;
-                  //uv[0] = (((float)x) + 0.5f) / (float)ibuf->x;
+                  // uv[0] = (((float)x) + 0.5f) / (float)ibuf->x;
                   /* use offset uvs instead */
                   uv[0] = (float)x / ibuf_xf;
 
@@ -4228,7 +4228,7 @@ static bool project_paint_winclip(const ProjPaintState *ps, const ProjPaintFaceC
            (coSS->v1[1] > ps->screenMax[1] && coSS->v2[1] > ps->screenMax[1] &&
             coSS->v3[1] > ps->screenMax[1])));
 }
-#endif  //PROJ_DEBUG_WINCLIP
+#endif  // PROJ_DEBUG_WINCLIP
 
 static void project_paint_build_proj_ima(ProjPaintState *ps,
                                          MemArena *arena,
@@ -4344,7 +4344,7 @@ static void project_paint_prepare_all_faces(ProjPaintState *ps,
           continue;
         }
 
-#endif  //PROJ_DEBUG_WINCLIP
+#endif  // PROJ_DEBUG_WINCLIP
 
         /* backface culls individual triangles but mask normal will use polygon */
         if (ps->do_backfacecull) {
@@ -4449,7 +4449,7 @@ static void project_paint_begin(const bContext *C,
   proj_paint_layer_clone_init(ps, &layer_clone);
 
   if (ps->do_layer_stencil || ps->do_stencil_brush) {
-    //int layer_num = CustomData_get_stencil_layer(&ps->me_eval->ldata, CD_MLOOPUV);
+    // int layer_num = CustomData_get_stencil_layer(&ps->me_eval->ldata, CD_MLOOPUV);
     int layer_num = CustomData_get_stencil_layer(&((Mesh *)ps->ob->data)->ldata, CD_MLOOPUV);
     if (layer_num != -1) {
       ps->mloopuv_stencil_eval = CustomData_get_layer_n(
@@ -4741,7 +4741,7 @@ static bool project_bucket_iter_next(ProjPaintState *ps,
     BLI_thread_lock(LOCK_CUSTOM1);
   }
 
-  //printf("%d %d\n", ps->context_bucket_x, ps->context_bucket_y);
+  // printf("%d %d\n", ps->context_bucket_x, ps->context_bucket_y);
 
   for (; ps->context_bucket_y < ps->bucketMax[1]; ps->context_bucket_y++) {
     for (; ps->context_bucket_x < ps->bucketMax[0]; ps->context_bucket_x++) {
@@ -5565,7 +5565,7 @@ static bool project_paint_op(void *state, const float lastpos[2], const float po
   for (a = 0; a < ps->thread_tot; a++) {
 
     /* set defaults in handles */
-    //memset(&handles[a], 0, sizeof(BakeShade));
+    // memset(&handles[a], 0, sizeof(BakeShade));
 
     handles[a].ps = ps;
     copy_v2_v2(handles[a].mval, pos);
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c
index 3cda90ea3f9..00336b02639 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -189,7 +189,7 @@ static void brush_drawcursor_uvsculpt(bContext *C, int x, int y, void *UNUSED(cu
 #define PX_SIZE_FADE_MIN 4.0f
 
   Scene *scene = CTX_data_scene(C);
-  //Brush *brush = image_paint_brush(C);
+  // Brush *brush = image_paint_brush(C);
   Paint *paint = BKE_paint_get_active_from_context(C);
   Brush *brush = BKE_paint_brush(paint);
 
diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c
index c2165e8ec70..25c05e2d1d0 100644
--- a/source/blender/editors/sound/sound_ops.c
+++ b/source/blender/editors/sound/sound_ops.c
@@ -144,7 +144,7 @@ static int sound_open_exec(bContext *C, wmOperator *op)
   return OPERATOR_FINISHED;
 }
 
-#else  //WITH_AUDASPACE
+#else  // WITH_AUDASPACE
 
 static int sound_open_exec(bContext *UNUSED(C), wmOperator *op)
 {
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index 7df3077ae61..8df773e98d6 100644
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -1103,7 +1103,7 @@ void ACTION_OT_clean(wmOperatorType *ot)
   ot->description = "Simplify F-Curves by removing closely spaced keyframes";
 
   /* api callbacks */
-  //ot->invoke =  // XXX we need that number popup for this!
+  // ot->invoke =  // XXX we need that number popup for this!
   ot->exec = actkeys_clean_exec;
   ot->poll = ED_operator_action_active;
 
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 192134949d5..1614e1c432d 100644
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -1598,7 +1598,7 @@ static void mouse_action_keys(bAnimContext *ac,
         bGPDlayer *gpl = ale->data;
 
         gpl->flag |= GP_LAYER_SELECT;
-        //gpencil_layer_setactive(gpd, gpl);
+        // gpencil_layer_setactive(gpd, gpl);
       }
     }
     else if (ac->datatype == ANIMCONT_MASK) {
@@ -1610,7 +1610,7 @@ static void mouse_action_keys(bAnimContext *ac,
         MaskLayer *masklay = ale->data;
 
         masklay->flag |= MASK_LAYERFLAG_SELECT;
-        //gpencil_layer_setactive(gpd, gpl);
+        // gpencil_layer_setactive(gpd, gpl);
       }
     }
   }
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index ce1b53b7bf9..e802ef8d010 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -712,7 +712,7 @@ static void action_header_region_listener(
           break;
 
         case ND_KEYFRAME: /* new keyframed added -> active action may have changed */
-          //saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
+          // saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
           ED_region_tag_redraw(ar);
           break;
       }
diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c
index 9632eadeccf..999255aef88 100644
--- a/source/blender/editors/space_console/space_console.c
+++ b/source/blender/editors/space_console/space_console.c
@@ -77,7 +77,7 @@ static SpaceLink *console_new(const ScrArea *UNUSED(area), const Scene *UNUSED(s
   ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
 
   /* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
-  //ar->v2d.keepzoom = (V2D_KEEPASPECT|V2D_LIMITZOOM);
+  // ar->v2d.keepzoom = (V2D_KEEPASPECT|V2D_LIMITZOOM);
 
   return (SpaceLink *)sconsole;
 }
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 0e63270d104..38423a87447 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -522,7 +522,8 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks)
 #  ifdef __APPLE__
   {
     /* Get mounted volumes better method OSX 10.6 and higher, see:
-     * https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html */
+     * https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html
+     */
 
     /* We get all volumes sorted including network and do not relay
      * on user-defined finder visibility, less confusing. */
diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index fe1291de224..5f118151a33 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -883,7 +883,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu)
   float unitfac = ANIM_unit_mapping_get_factor(ac->scene, id, fcu, mapping_flag, &offset);
 
   /* for now, only show when debugging driver... */
-  //if ((driver->flag & DRIVER_FLAG_SHOWDEBUG) == 0)
+  // if ((driver->flag & DRIVER_FLAG_SHOWDEBUG) == 0)
   //  return;
 
   const uint shdr_pos = GPU_vertformat_attr_add(
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 1bb14bc3ce2..573e3cb5899 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -1275,7 +1275,7 @@ void GRAPH_OT_clean(wmOperatorType *ot)
   ot->description = "Simplify F-Curves by removing closely spaced keyframes";
 
   /* api callbacks */
-  //ot->invoke =  // XXX we need that number popup for this!
+  // ot->invoke =  // XXX we need that number popup for this!
   ot->exec = graphkeys_clean_exec;
   ot->poll = graphop_editable_keyframes_poll;
 
@@ -1484,7 +1484,7 @@ static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op)
   return OPERATOR_FINISHED;
 }
 
-#else  //WITH_AUDASPACE
+#else  // WITH_AUDASPACE
 
 static int graphkeys_sound_bake_exec(bContext *UNUSED(C), wmOperator *op)
 {
@@ -1493,7 +1493,7 @@ static int graphkeys_sound_bake_exec(bContext *UNUSED(C), wmOperator *op)
   return OPERATOR_CANCELLED;
 }
 
-#endif  //WITH_AUDASPACE
+#endif  // WITH_AUDASPACE
 
 static int graphkeys_sound_bake_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c
index 1ae69394d0a..d8e1b9d2035 100644
--- a/source/blender/editors/space_graph/space_graph.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -627,7 +627,7 @@ static void graph_listener(wmWindow *UNUSED(win),
       break;
 
       // XXX: restore the case below if not enough updates occur...
-      //default:
+      // default:
       //  if (wmn->data == ND_KEYS)
       //      ED_area_tag_redraw(sa);
   }
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 3baee1d723b..9b57644b6ec 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -673,7 +673,7 @@ void draw_image_grease_pencil(bContext *C, bool onlyv2d)
   }
   else {
     /* assume that UI_view2d_restore(C) has been called... */
-    //SpaceImage *sima = (SpaceImage *)CTX_wm_space_data(C);
+    // SpaceImage *sima = (SpaceImage *)CTX_wm_space_data(C);
 
     /* draw grease-pencil ('screen' strokes) */
     ED_annotation_draw_view2d(C, 0);
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 748841e8635..93c49ab726a 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -580,7 +580,7 @@ static void image_zoom_apply(ViewZoomData *vpd,
     zfac = 1.0f + ((fac / 20.0f) * time_step);
     vpd->timer_lastdraw = time;
     /* this is the final zoom, but instead make it into a factor */
-    //zoom = vpd->sima->zoom * zfac;
+    // zoom = vpd->sima->zoom * zfac;
     factor = (vpd->sima->zoom * zfac) / vpd->zoom;
   }
   else {
@@ -1735,7 +1735,7 @@ static int image_save_options_init(Main *bmain,
     }
 
     ///* XXX - this is lame, we need to make these available too! */
-    //opts->subimtype = scene->r.subimtype;
+    // opts->subimtype = scene->r.subimtype;
 
     BLI_strncpy(opts->filepath, ibuf->name, sizeof(opts->filepath));
 
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 67176f9bc49..ae2620118e9 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -574,7 +574,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar)
   Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   View2D *v2d = &ar->v2d;
-  //View2DScrollers *scrollers;
+  // View2DScrollers *scrollers;
   float col[3];
 
   /* XXX This is in order to draw UI batches with the DRW
diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c
index a7d6694b362..c588df9528f 100644
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@ -116,7 +116,7 @@ static int report_textview_begin(TextViewContext *tvc)
   // SpaceConsole *sc = (SpaceConsole *)tvc->arg1;
   ReportList *reports = (ReportList *)tvc->arg2;
 
-  tvc->lheight = 14 * UI_DPI_FAC;  //sc->lheight;
+  tvc->lheight = 14 * UI_DPI_FAC;  // sc->lheight;
   tvc->sel_start = 0;
   tvc->sel_end = 0;
 
@@ -256,7 +256,7 @@ static int info_textview_main__internal(struct SpaceInfo *sinfo,
   /* view */
   tvc.sel_start = 0;
   tvc.sel_end = 0;
-  tvc.lheight = 14 * UI_DPI_FAC;  //sc->lheight;
+  tvc.lheight = 14 * UI_DPI_FAC;  // sc->lheight;
   tvc.ymin = v2d->cur.ymin;
   tvc.ymax = v2d->cur.ymax;
   tvc.winx = ar->winx - V2D_SCROLL_WIDTH;
diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index bbe2acfa5d7..8eddf90b06b 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -85,7 +85,7 @@ static SpaceLink *info_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scen
   ar->v2d.minzoom = ar->v2d.maxzoom = 1.0f;
 
   /* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
-  //ar->v2d.keepzoom = (V2D_KEEPASPECT|V2D_LIMITZOOM);
+  // ar->v2d.keepzoom = (V2D_KEEPASPECT|V2D_LIMITZOOM);
 
   return (SpaceLink *)sinfo;
 }
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index d6353a9b0d4..719efc7eeac 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -59,7 +59,7 @@
 
 static void do_nla_region_buttons(bContext *C, void *UNUSED(arg), int UNUSED(event))
 {
-  //Scene *scene = CTX_data_scene(C);
+  // Scene *scene = CTX_data_scene(C);
 #if 0
   switch (event) {
     /* pass */
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c
index 216ef947a9b..0446235a776 100644
--- a/source/blender/editors/space_nla/nla_edit.c
+++ b/source/blender/editors/space_nla/nla_edit.c
@@ -617,7 +617,7 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
 
   if (act == NULL) {
     BKE_report(op->reports, RPT_ERROR, "No valid action to add");
-    //printf("Add strip - actname = '%s'\n", actname);
+    // printf("Add strip - actname = '%s'\n", actname);
     return OPERATOR_CANCELLED;
   }
   else if (act->idroot == 0) {
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index b8753d0cbfb..020bdbf60a1 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -1309,7 +1309,7 @@ static void node_draw_hidden(const bContext *C,
   nodeLabel(ntree, node, showname, sizeof(showname));
 
   /* XXX - don't print into self! */
-  //if (node->flag & NODE_MUTED)
+  // if (node->flag & NODE_MUTED)
   //  BLI_snprintf(showname, sizeof(showname), "[%s]", showname);
 
   uiBut *but = uiDefBut(node->block,
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index b512f71aae1..a46f72a28e7 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2763,7 +2763,7 @@ void draw_outliner(const bContext *C)
   else {
     /* width must take into account restriction columns (if visible)
      * so that entries will still be visible */
-    //outliner_width(soops, &soops->tree, &sizex);
+    // outliner_width(soops, &soops->tree, &sizex);
     // XXX should use outliner_width instead when te->xend will be set correctly...
     outliner_rna_width(soops, &soops->tree, &sizex, 0);
 
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index a620af798d7..0f9efb0d2e1 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1846,8 +1846,8 @@ typedef enum eOutliner_AnimDataOps {
   OUTLINER_ANIMOP_REFRESH_DRV,
   OUTLINER_ANIMOP_CLEAR_DRV
 
-  //OUTLINER_ANIMOP_COPY_DRIVERS,
-  //OUTLINER_ANIMOP_PASTE_DRIVERS
+  // OUTLINER_ANIMOP_COPY_DRIVERS,
+  // OUTLINER_ANIMOP_PASTE_DRIVERS
 } eOutliner_AnimDataOps;
 
 static const EnumPropertyItem prop_animdata_op_types[] = {
@@ -1913,7 +1913,7 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
           soops, datalevel, event, &soops->tree, refreshdrivers_animdata_cb, NULL);
 
       WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN, NULL);
-      //ED_undo_push(C, "Refresh Drivers"); /* no undo needed - shouldn't have any impact? */
+      // ED_undo_push(C, "Refresh Drivers"); /* no undo needed - shouldn't have any impact? */
       updateDeps = 1;
       break;
 
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index c7a5f9bba6e..4e3fd6037bb 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -360,12 +360,12 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
         pchan->temp = (void *)ten;
 
         if (pchan->constraints.first) {
-          //Object *target;
+          // Object *target;
           bConstraint *con;
           TreeElement *ten1;
           TreeElement *tenla1 = outliner_add_element(
               soops, &ten->subtree, ob, ten, TSE_CONSTRAINT_BASE, 0);
-          //char *str;
+          // char *str;
 
           tenla1->name = IFACE_("Constraints");
           for (con = pchan->constraints.first; con; con = con->next, const_index++) {
@@ -426,11 +426,11 @@ static void outliner_add_object_contents(SpaceOutliner *soops,
   }
 
   if (ob->constraints.first) {
-    //Object *target;
+    // Object *target;
     bConstraint *con;
     TreeElement *ten;
     TreeElement *tenla = outliner_add_element(soops, &te->subtree, ob, te, TSE_CONSTRAINT_BASE, 0);
-    //char *str;
+    // char *str;
     int a;
 
     tenla->name = IFACE_("Constraints");
@@ -654,7 +654,7 @@ static void outliner_add_id_contents(SpaceOutliner *soops,
     }
     case ID_AC: {
       // XXX do we want to be exposing the F-Curves here?
-      //bAction *act = (bAction *)id;
+      // bAction *act = (bAction *)id;
       break;
     }
     case ID_AR: {
diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c
index e1d01847ad7..b99c2eaf54e 100644
--- a/source/blender/editors/space_script/space_script.c
+++ b/source/blender/editors/space_script/space_script.c
@@ -47,7 +47,7 @@
 #include "script_intern.h"  // own include
 #include "GPU_framebuffer.h"
 
-//static script_run_python(char *funcname, )
+// static script_run_python(char *funcname, )
 
 /* ******************** default callbacks for script space ***************** */
 
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index eb2d2512ac0..b5bb79fb430 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -715,7 +715,7 @@ static int sequencer_add_movie_strip_invoke(bContext *C,
   WM_event_add_fileselect(C, op);
   return OPERATOR_RUNNING_MODAL;
 
-  //return sequencer_add_movie_strip_exec(C, op);
+  // return sequencer_add_movie_strip_exec(C, op);
 }
 
 static void sequencer_add_draw(bContext *UNUSED(C), wmOperator *op)
@@ -797,7 +797,7 @@ static int sequencer_add_sound_strip_invoke(bContext *C,
   WM_event_add_fileselect(C, op);
   return OPERATOR_RUNNING_MODAL;
 
-  //return sequencer_add_sound_strip_exec(C, op);
+  // return sequencer_add_sound_strip_exec(C, op);
 }
 
 void SEQUENCER_OT_sound_strip_add(struct wmOperatorType *ot)
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 052917d16d0..c8390b2a8ea 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -461,7 +461,7 @@ static void draw_seq_handle(View2D *v2d,
                             const short direction,
                             unsigned int pos)
 {
-  float v1[2], v2[2], v3[2], rx1 = 0, rx2 = 0;  //for triangles and rect
+  float v1[2], v2[2], v3[2], rx1 = 0, rx2 = 0;  // for triangles and rect
   float x1, x2, y1, y2;
   unsigned int whichsel = 0;
 
@@ -817,7 +817,7 @@ static void draw_seq_strip(const bContext *C,
   immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
   /* get the correct color per strip type*/
-  //color3ubv_from_seq(scene, seq, col);
+  // color3ubv_from_seq(scene, seq, col);
   color3ubv_from_seq(scene, seq, background_col);
 
   if (seq->flag & SEQ_MUTE) {
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 9244bbb3034..dd04260d80e 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -91,7 +91,7 @@ int seq_effect_find_selected(struct Scene *scene,
 /* operator helpers */
 bool sequencer_edit_poll(struct bContext *C);
 /* UNUSED */
-//bool sequencer_strip_poll(struct bContext *C);
+// bool sequencer_strip_poll(struct bContext *C);
 bool sequencer_strip_has_path_poll(struct bContext *C);
 bool sequencer_view_preview_poll(struct bContext *C);
 bool sequencer_view_strips_poll(struct bContext *C);
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 5ada34fc791..f40514e7574 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -331,7 +331,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e
     return OPERATOR_CANCELLED;
   }
 
-  marker = find_nearest_marker(SCE_MARKERS, 1);  //XXX - dummy function for now
+  marker = find_nearest_marker(SCE_MARKERS, 1);  // XXX - dummy function for now
 
   seq = find_nearest_seq(scene, v2d, &hand, event->mval);
 
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c
index 899805338d6..24f282ff920 100644
--- a/source/blender/editors/space_text/space_text.c
+++ b/source/blender/editors/space_text/space_text.c
@@ -287,7 +287,7 @@ static void text_main_region_draw(const bContext *C, ARegion *ar)
 {
   /* draw entirely, view changes should be handled here */
   SpaceText *st = CTX_wm_space_text(C);
-  //View2D *v2d = &ar->v2d;
+  // View2D *v2d = &ar->v2d;
 
   /* clear and setup matrix */
   UI_ThemeClearColor(TH_BACK);
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 1c7e7b13589..7b6e0ff8771 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -385,7 +385,7 @@ void TEXT_OT_open(wmOperatorType *ot)
                                  FILE_OPENFILE,
                                  WM_FILESEL_FILEPATH,
                                  FILE_DEFAULTDISPLAY,
-                                 FILE_SORT_ALPHA);  //XXX TODO, relative_path
+                                 FILE_SORT_ALPHA);  // XXX TODO, relative_path
   RNA_def_boolean(
       ot->srna, "internal", 0, "Make internal", "Make text file internal after loading");
 }
@@ -685,7 +685,7 @@ void TEXT_OT_save_as(wmOperatorType *ot)
                                  FILE_SAVE,
                                  WM_FILESEL_FILEPATH,
                                  FILE_DEFAULTDISPLAY,
-                                 FILE_SORT_ALPHA);  //XXX TODO, relative_path
+                                 FILE_SORT_ALPHA);  // XXX TODO, relative_path
 }
 
 /******************* run script operator *********************/
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 54681c4bed1..b0cee18f8e3 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -995,8 +995,8 @@ void ED_scene_draw_fps(Scene *scene, int xoffset, int *yoffset)
   if (tot) {
     fpsi->redrawtime_index = (fpsi->redrawtime_index + 1) % REDRAW_FRAME_AVERAGE;
 
-    //fpsi->redrawtime_index++;
-    //if (fpsi->redrawtime >= REDRAW_FRAME_AVERAGE) {
+    // fpsi->redrawtime_index++;
+    // if (fpsi->redrawtime >= REDRAW_FRAME_AVERAGE) {
     //  fpsi->redrawtime = 0;
     //}
 
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 48ce23c2c99..81405b55ac2 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -601,18 +601,18 @@ static void viewRedrawForce(const bContext *C, TransInfo *t)
     }
   }
   else if (t->spacetype == SPACE_ACTION) {
-    //SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
+    // SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
     WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
   }
   else if (t->spacetype == SPACE_GRAPH) {
-    //SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first;
+    // SpaceGraph *sipo = (SpaceGraph *)t->sa->spacedata.first;
     WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
   }
   else if (t->spacetype == SPACE_NLA) {
     WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_EDITED, NULL);
   }
   else if (t->spacetype == SPACE_NODE) {
-    //ED_area_tag_redraw(t->sa);
+    // ED_area_tag_redraw(t->sa);
     WM_event_add_notifier(C, NC_SPACE | ND_SPACE_NODE_VIEW, NULL);
   }
   else if (t->spacetype == SPACE_SEQ) {
@@ -3291,7 +3291,7 @@ static void initBend(TransInfo *t)
 
   t->flag |= T_NO_CONSTRAINT;
 
-  //copy_v3_v3(t->center, ED_view3d_cursor3d_get(t->scene, t->view));
+  // copy_v3_v3(t->center, ED_view3d_cursor3d_get(t->scene, t->view));
   if ((t->flag & T_OVERRIDE_CENTER) == 0) {
     calculateCenterCursor(t, t->center_global);
   }
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index b5b956441b3..d4ed2862ad9 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -500,7 +500,7 @@ static void createTransEdge(TransInfo *t)
       BM_mesh_cd_flag_ensure(em->bm, BKE_mesh_from_object(tc->obedit), ME_CDFLAG_EDGE_BWEIGHT);
       cd_edge_float_offset = CustomData_get_offset(&em->bm->edata, CD_BWEIGHT);
     }
-    else {  //if (t->mode == TFM_CREASE) {
+    else {  // if (t->mode == TFM_CREASE) {
       BLI_assert(t->mode == TFM_CREASE);
       BM_mesh_cd_flag_ensure(em->bm, BKE_mesh_from_object(tc->obedit), ME_CDFLAG_EDGE_CREASE);
       cd_edge_float_offset = CustomData_get_offset(&em->bm->edata, CD_CREASE);
@@ -2772,9 +2772,9 @@ static void VertsToTransData(TransInfo *t,
   BLI_assert(BM_elem_flag_test(eve, BM_ELEM_HIDDEN) == 0);
 
   td->flag = 0;
-  //if (key)
+  // if (key)
   //  td->loc = key->co;
-  //else
+  // else
   td->loc = eve->co;
   copy_v3_v3(td->iloc, td->loc);
 
@@ -3060,7 +3060,7 @@ static void createTransEditVerts(TransInfo *t)
 
           /* Mirror? */
           if ((mirror > 0 && tob->iloc[0] > 0.0f) || (mirror < 0 && tob->iloc[0] < 0.0f)) {
-            BMVert *vmir = EDBM_verts_mirror_get(em, eve);  //t->obedit, em, eve, tob->iloc, a);
+            BMVert *vmir = EDBM_verts_mirror_get(em, eve);  // t->obedit, em, eve, tob->iloc, a);
             if (vmir && vmir != eve) {
               tob->extra = vmir;
             }
@@ -6859,7 +6859,7 @@ static void special_aftertrans_update__mask(bContext *C, TransInfo *t)
   if (t->scene->nodetree) {
     /* tracks can be used for stabilization nodes,
      * flush update for such nodes */
-    //if (nodeUpdateID(t->scene->nodetree, &mask->id))
+    // if (nodeUpdateID(t->scene->nodetree, &mask->id))
     {
       WM_event_add_notifier(C, NC_MASK | ND_DATA, &mask->id);
     }
@@ -7748,7 +7748,7 @@ static void markerToTransDataInit(TransData *td,
   td->loc = td2d->loc;
   copy_v3_v3(td->iloc, td->loc);
 
-  //copy_v3_v3(td->center, td->loc);
+  // copy_v3_v3(td->center, td->loc);
   td->flag |= TD_INDIVIDUAL_SCALE;
   td->center[0] = marker->pos[0] * aspect[0];
   td->center[1] = marker->pos[1] * aspect[1];
@@ -9342,7 +9342,7 @@ void createTransData(bContext *C, TransInfo *t)
     if (t->data_len_all && (t->flag & T_PROP_EDIT)) {
       sort_trans_data(t);  // makes selected become first in array
       /* don't do that, distance has been set in createTransActionData already */
-      //set_prop_dist(t, false);
+      // set_prop_dist(t, false);
       sort_trans_data_dist(t);
     }
   }
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 0c2f77852a3..1b912f25a46 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -974,7 +974,7 @@ static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot)
 {
   /* identifiers */
   ot->name = "To Sphere";
-  //added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()"
+  // added "around mesh center" to differentiate between "MESH_OT_vertices_to_sphere()"
   ot->description = "Move selected vertices outward in a spherical shape around mesh center";
   ot->idname = OP_TOSPHERE;
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index e8bd8e905c9..7b978487177 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -360,7 +360,7 @@ void applyProject(TransInfo *t)
           }
         }
 
-        //XXX constraintTransLim(t, td);
+        // XXX constraintTransLim(t, td);
       }
     }
   }
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 9174f6950ae..829365367ee 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -953,7 +953,7 @@ static void cb_mlooptri_edges_get(const int index, int v_index[3], const BVHTree
     const MEdge *ed = &medge[mloop[lt->tri[j]].e];
     unsigned int tri_edge[2] = {mloop[lt->tri[j]].v, mloop[lt->tri[j_next]].v};
     if (ELEM(ed->v1, tri_edge[0], tri_edge[1]) && ELEM(ed->v2, tri_edge[0], tri_edge[1])) {
-      //printf("real edge found\n");
+      // printf("real edge found\n");
       v_index[j] = mloop[lt->tri[j]].e;
     }
     else {
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 867271229e2..df1906ea8a8 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -330,7 +330,7 @@ void unpack_menu(bContext *C,
           break;
         case PF_EQUAL:
           BLI_snprintf(line, sizeof(line), IFACE_("Use %s (identical)"), local_name);
-          //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_LOCAL);
+          // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_LOCAL);
           uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
           RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL);
           RNA_string_set(&props_ptr, "id", id_name);
@@ -338,13 +338,13 @@ void unpack_menu(bContext *C,
           break;
         case PF_DIFFERS:
           BLI_snprintf(line, sizeof(line), IFACE_("Use %s (differs)"), local_name);
-          //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_LOCAL);
+          // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_LOCAL);
           uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
           RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL);
           RNA_string_set(&props_ptr, "id", id_name);
 
           BLI_snprintf(line, sizeof(line), IFACE_("Overwrite %s"), local_name);
-          //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_LOCAL);
+          // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_LOCAL);
           uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
           RNA_enum_set(&props_ptr, "method", PF_WRITE_LOCAL);
           RNA_string_set(&props_ptr, "id", id_name);
@@ -356,27 +356,27 @@ void unpack_menu(bContext *C,
   switch (checkPackedFile(BKE_main_blendfile_path(bmain), abs_name, pf)) {
     case PF_NOFILE:
       BLI_snprintf(line, sizeof(line), IFACE_("Create %s"), abs_name);
-      //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL);
+      // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL);
       uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
       RNA_enum_set(&props_ptr, "method", PF_WRITE_ORIGINAL);
       RNA_string_set(&props_ptr, "id", id_name);
       break;
     case PF_EQUAL:
       BLI_snprintf(line, sizeof(line), IFACE_("Use %s (identical)"), abs_name);
-      //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_ORIGINAL);
+      // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_ORIGINAL);
       uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
       RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL);
       RNA_string_set(&props_ptr, "id", id_name);
       break;
     case PF_DIFFERS:
       BLI_snprintf(line, sizeof(line), IFACE_("Use %s (differs)"), abs_name);
-      //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_ORIGINAL);
+      // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_ORIGINAL);
       uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
       RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL);
       RNA_string_set(&props_ptr, "id", id_name);
 
       BLI_snprintf(line, sizeof(line), IFACE_("Overwrite %s"), abs_name);
-      //uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL);
+      // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL);
       uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr);
       RNA_enum_set(&props_ptr, "method", PF_WRITE_ORIGINAL);
       RNA_string_set(&props_ptr, "id", id_name);