[Bf-blender-cvs] [b2ee1770d4c] master: Cleanup: Rename ARegion variables from ar to region

Julian Eisel noreply at git.blender.org
Fri Mar 6 17:20:56 CET 2020


Commit: b2ee1770d4c31078518f4ec9edd5196a41345162
Author: Julian Eisel
Date:   Fri Mar 6 16:56:42 2020 +0100
Branches: master
https://developer.blender.org/rBb2ee1770d4c31078518f4ec9edd5196a41345162

Cleanup: Rename ARegion variables from ar to region

The old convention was easy to confuse with ScrArea.
Part of https://developer.blender.org/T74432.

This is mostly a batch rename with some manual fixing. Only single word
variable names are changed, no prefixed/suffixed names.

Brecht van Lommel and Campbell Barton both gave me a green light for
this convention change.

Also ran clan clang format on affected files.

===================================================================

M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/BKE_screen.h
M	source/blender/blenkernel/intern/context.c
M	source/blender/blenkernel/intern/screen.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/versioning_250.c
M	source/blender/blenloader/intern/versioning_260.c
M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/blenloader/intern/versioning_defaults.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/draw/DRW_engine.h
M	source/blender/draw/DRW_select_buffer.h
M	source/blender/draw/engines/eevee/eevee_lookdev.c
M	source/blender/draw/engines/eevee/eevee_motion_blur.c
M	source/blender/draw/engines/external/external_engine.c
M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/draw/engines/overlay/overlay_edit_mesh.c
M	source/blender/draw/engines/select/select_engine.c
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_manager_text.c
M	source/blender/draw/intern/draw_manager_text.h
M	source/blender/draw/intern/draw_select_buffer.c
M	source/blender/draw/intern/draw_view.c
M	source/blender/editors/animation/anim_channels_defines.c
M	source/blender/editors/animation/anim_channels_edit.c
M	source/blender/editors/animation/anim_draw.c
M	source/blender/editors/animation/anim_filter.c
M	source/blender/editors/animation/anim_markers.c
M	source/blender/editors/animation/anim_ops.c
M	source/blender/editors/animation/time_scrub_ui.c
M	source/blender/editors/armature/armature_add.c
M	source/blender/editors/armature/pose_slide.c
M	source/blender/editors/curve/editcurve.c
M	source/blender/editors/curve/editcurve_paint.c
M	source/blender/editors/curve/editfont.c
M	source/blender/editors/gizmo_library/gizmo_library_utils.c
M	source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
M	source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
M	source/blender/editors/gpencil/annotate_draw.c
M	source/blender/editors/gpencil/annotate_paint.c
M	source/blender/editors/gpencil/drawgpencil.c
M	source/blender/editors/gpencil/gpencil_brush.c
M	source/blender/editors/gpencil/gpencil_convert.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_fill.c
M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/gpencil/gpencil_interpolate.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/gpencil/gpencil_primitive.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/include/ED_anim_api.h
M	source/blender/editors/include/ED_clip.h
M	source/blender/editors/include/ED_fileselect.h
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/editors/include/ED_image.h
M	source/blender/editors/include/ED_mask.h
M	source/blender/editors/include/ED_mesh.h
M	source/blender/editors/include/ED_node.h
M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/include/ED_screen_types.h
M	source/blender/editors/include/ED_sculpt.h
M	source/blender/editors/include/ED_space_api.h
M	source/blender/editors/include/ED_text.h
M	source/blender/editors/include/ED_time_scrub_ui.h
M	source/blender/editors/include/ED_transform_snap_object_context.h
M	source/blender/editors/include/ED_uvedit.h
M	source/blender/editors/include/ED_view3d.h
M	source/blender/editors/include/ED_view3d_offscreen.h
M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/include/UI_view2d.h
M	source/blender/editors/interface/interface.c
M	source/blender/editors/interface/interface_align.c
M	source/blender/editors/interface/interface_context_menu.c
M	source/blender/editors/interface/interface_draw.c
M	source/blender/editors/interface/interface_eyedropper.c
M	source/blender/editors/interface/interface_eyedropper_color.c
M	source/blender/editors/interface/interface_eyedropper_datablock.c
M	source/blender/editors/interface/interface_eyedropper_depth.c
M	source/blender/editors/interface/interface_eyedropper_intern.h
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_layout.c
M	source/blender/editors/interface/interface_ops.c
M	source/blender/editors/interface/interface_panel.c
M	source/blender/editors/interface/interface_query.c
M	source/blender/editors/interface/interface_region_hud.c
M	source/blender/editors/interface/interface_region_menu_popup.c
M	source/blender/editors/interface/interface_region_popover.c
M	source/blender/editors/interface/interface_region_popup.c
M	source/blender/editors/interface/interface_region_search.c
M	source/blender/editors/interface/interface_region_tooltip.c
M	source/blender/editors/interface/interface_regions.c
M	source/blender/editors/interface/interface_regions_intern.h
M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/interface/interface_widgets.c
M	source/blender/editors/interface/view2d.c
M	source/blender/editors/interface/view2d_draw.c
M	source/blender/editors/interface/view2d_gizmo_navigate.c
M	source/blender/editors/interface/view2d_ops.c
M	source/blender/editors/mask/mask_add.c
M	source/blender/editors/mask/mask_draw.c
M	source/blender/editors/mask/mask_edit.c
M	source/blender/editors/mask/mask_ops.c
M	source/blender/editors/mask/mask_select.c
M	source/blender/editors/mesh/editmesh_add_gizmo.c
M	source/blender/editors/mesh/editmesh_bevel.c
M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_extrude.c
M	source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
M	source/blender/editors/mesh/editmesh_inset.c
M	source/blender/editors/mesh/editmesh_knife.c
M	source/blender/editors/mesh/editmesh_knife_project.c
M	source/blender/editors/mesh/editmesh_loopcut.c
M	source/blender/editors/mesh/editmesh_polybuild.c
M	source/blender/editors/mesh/editmesh_preselect_elem.c
M	source/blender/editors/mesh/editmesh_rip.c
M	source/blender/editors/mesh/editmesh_rip_edge.c
M	source/blender/editors/mesh/editmesh_select.c
M	source/blender/editors/mesh/editmesh_tools.c
M	source/blender/editors/mesh/editmesh_utils.c
M	source/blender/editors/mesh/meshtools.c
M	source/blender/editors/object/object_add.c
M	source/blender/editors/object/object_transform.c
M	source/blender/editors/physics/particle_edit.c
M	source/blender/editors/render/render_opengl.c
M	source/blender/editors/render/render_update.c
M	source/blender/editors/screen/area.c
M	source/blender/editors/screen/area_query.c
M	source/blender/editors/screen/area_utils.c
M	source/blender/editors/screen/screen_edit.c
M	source/blender/editors/screen/screen_intern.h
M	source/blender/editors/screen/screen_ops.c
M	source/blender/editors/sculpt_paint/paint_cursor.c
M	source/blender/editors/sculpt_paint/paint_curve.c
M	source/blender/editors/sculpt_paint/paint_hide.c
M	source/blender/editors/sculpt_paint/paint_image.c
M	source/blender/editors/sculpt_paint/paint_image_proj.c
M	source/blender/editors/sculpt_paint/paint_intern.h
M	source/blender/editors/sculpt_paint/paint_mask.c
M	source/blender/editors/sculpt_paint/paint_ops.c
M	source/blender/editors/sculpt_paint/paint_stroke.c
M	source/blender/editors/sculpt_paint/paint_utils.c
M	source/blender/editors/sculpt_paint/paint_vertex.c
M	source/blender/editors/sculpt_paint/paint_vertex_proj.c
M	source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/sculpt_paint/sculpt_intern.h
M	source/blender/editors/sculpt_paint/sculpt_uv.c
M	source/blender/editors/space_action/action_draw.c
M	source/blender/editors/space_action/action_edit.c
M	source/blender/editors/space_action/action_intern.h
M	source/blender/editors/space_action/action_select.c
M	source/blender/editors/space_action/space_action.c
M	source/blender/editors/space_api/spacetypes.c
M	source/blender/editors/space_buttons/space_buttons.c
M	source/blender/editors/space_clip/clip_dopesheet_draw.c
M	source/blender/editors/space_clip/clip_dopesheet_ops.c
M	source/blender/editors/space_clip/clip_draw.c
M	source/blender/editors/space_clip/clip_editor.c
M	source/blender/editors/space_clip/clip_graph_draw.c
M	source/blender/editors/space_clip/clip_graph_ops.c
M	source/blender/editors/space_clip/clip_intern.h
M	source/blender/editors/space_clip/clip_ops.c
M	source/blender/editors/space_clip/clip_toolbar.c
M	source/blender/editors/space_clip/space_clip.c
M	source/blender/editors/space_clip/tracking_ops.c
M	source/blender/editors/space_clip/tracking_ops_plane.c
M	source/blender/editors/space_clip/tracking_select.c
M	source/blender/editors/space_console/console_draw.c
M	source/blender/editors/space_console/console_intern.h
M	source/blender/editors/space_console/console_ops.c
M	source/blender/editors/space_console/space_console.c
M	source/blender/editors/space_file/file_draw.c
M	source/blender/editors/space_file/file_intern.h
M	source/blender/editors/space_file/file_ops.c
M	source/blender/editors/space_file/file_utils.c
M	source/blender/editors/space_file/filesel.c
M	source/blender/editors/space_file/space_file.c
M	source/blender/editors/space_graph/graph_buttons.c
M	source/blender/editors/space_graph/graph_draw.c
M	source/blender/editors/space_graph/graph_edit.c
M	source/blender/editors/space_graph/graph_intern.h
M	source/blender/editors/space_graph/graph_ops.c
M	source/blender/editors/space_graph/graph_select.c
M	source/blender/editors/space_graph/space_graph.c
M	source/blender/editors/space_image/image_draw.c
M	source/blender/editors/space_image/image_edit.c
M	source/blender/editors/space_image/image_intern.h
M	source/blender/editors/space_image/image_ops.c
M	source/blender/editors/space_image/space_image.c
M	source/blender/editors/space_info/info_draw.c
M	source/blender/editors/space_info/info_intern.h
M	source/blender/editors/space_info/info_report.c
M	source/blender/editors/space_info/space_info.c
M	source/blender/editors/space_nla/nla_channels.c
M	source/blender/editors/space_nla/nla_draw.c
M	source/blender/editors/space_nla/nla_edit.c
M	source/blender/editors/space_nla/nla_intern.h
M	source/blender/editors/space_nla/nla_select.c
M	source/blender/editors/space_nla/space_nla.c
M	source/blender/editors/space_node/drawnode.c
M	source/blender/editors/space_node/node_add.c
M	source/blender/editors/space_node/node_draw.c
M	source/blender/editors/space_node/node_edit.c
M	source/blender/editors/space_node/node_gizmo.c
M	source/blender/editors/space_node/node_intern.h
M	source/blender/editors/space_node/node_relationships.c
M	source/blender/editors/space_node/node_select.c
M	source/blender/editors/space_node/node_view.c
M	source/blender/editors/space_node/space_node.c
M	source/blender/editors/space_outliner/outliner_collections.c
M	source/blender/editors/space_outliner/outliner_dragdrop.c
M	source/blender/editors/space_outliner/outliner_draw.c
M	source/blender/editors/space_outliner/outliner_edit.c
M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_select.c
M	source/blender/editors/space_outliner/outliner_tools.c
M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/editors/space_outliner/outliner_utils.c
M	source/blender/editors/space_outliner/space_outliner.c
M	source/blender/editors/space_script/script_edit.c
M	source/blender/editors/space_script/space_script.c
M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/editors/space_sequencer/sequencer_edit.c
M	source/blender/editors/space_sequencer/sequencer_intern.h
M	source/blender/editors/space_sequencer/sequencer_view.c
M	source/blender/editors/space_sequencer/space_sequencer.c
M	source/blender/editors/space_statusbar/space_statusbar.c
M	source/blender/editors/space_text/space_text.c
M	source/blender/editors/space_text/text_autocomplete.c
M	source/blender/editors/space_text/text_draw.c
M	source/blender/editors/space_text/text_header.c
M	source/blender/editors/space_text/text_intern.h
M	source/blender/editors/space_text/text_ops.c
M	source/blender/editors/space_topbar/space_topbar.c
M	source/blender/editors/space_userpref/space_userpref.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/space_view3d/view3d_fly.c
M	source/blender/editors/space_view3d/view3d_gizmo_camera.c
M	source/blender/editors/space_view3d/view3d_gizmo_navigate.c
M	source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
M	source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M	source/blender/editors/space_view3d/view3d_gizmo_tool_generic.c
M	source/blender/editors/space_view3d/view3d_intern.h
M	source/blender/editors/space_view3d/view3d_iterators.c
M	source/blender/editors/space_view3d/view3d_project.c
M	source/blender/editors/space_view3d/view3d_select.c
M	source/blender/editors/space_view3d/view3d_utils.c
M	source/blender/editors/space_view3d/view3d_view.c
M	source/blender/editors/space_view3d/view3d_walk.c
M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_constraints.c
M	source/blender/editors/transform/transform_convert.c
M	source/blender/editors/transform/transform_convert_action.c
M	source/blender/editors/transform/transform_convert_graph.c
M	source/blender/editors/transform/transform_convert_mask.c
M	source/blender/editors/transform/transform_convert_tracking.c
M	source/blender/editors/transform/transform_draw_cursors.c
M	source/blender/editors/transform/transform_generics.c
M	source/blender/editors/transform/transform_gizmo_2d.c
M	source/blender/editors/transform/transform_gizmo_3d.c
M	source/blender/editors/transform/transform_gizmo_extrude_3d.c
M	source/blender/editors/transform/transform_input.c
M	source/blender/editors/transform/transform_mode_bend.c
M	source/blender/editors/transform/transform_mode_edge_slide.c
M	source/blender/editors/transform/transform_mode_vert_slide.c
M	source/blender/editors/transform/transform_ops.c
M	source/blender/editors/transform/transform_orientations.c
M	source/blender/editors/transform/transform_snap.c
M	source/blender/editors/transform/transform_snap_object.c
M	source/blender/editors/util/ed_util.c
M	source/blender/editors/uvedit/uvedit_draw.c
M	source/blender/editors/uvedit/uvedit_ops.c
M	source/blender/editors/uvedit/uvedit_smart_stitch.c
M	source/blender/editors/uvedit/uvedit_unwrap_ops.c
M	source/blender/makesdna/DNA_screen_types.h
M	source/blender/makesrna/intern/rna_space.c
M	source/blender/makesrna/intern/rna_space_api.c
M	source/blender/makesrna/intern/rna_wm_gizmo.c
M	source/blender/python/gpu/gpu_py_offscreen.c
M	source/blender/python/intern/bpy_rna_callback.c
M	source/blender/windowmanager/WM_api.h
M	source/blender/windowmanager/WM_types.h
M	source/blender/windowmanager/gizmo/WM_gizmo_api.h
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
M	source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
M	source/blender/windowmanager/intern/wm_cursors.c
M	source/blender/windowmanager/intern/wm_dragdrop.c
M	source/blender/windowmanager/intern/wm_draw.c
M	source/blender/windowmanager/intern/wm_event_system.c
M	source/blender/windowmanager/intern/wm_files.c
M	source/blender/windowmanager/intern/wm_gesture.c
M	source/blender/windowmanager/intern/wm_gesture_ops.c
M	source/blender/windowmanager/intern/wm_keymap.c
M	source/blender/windowmanager/intern/wm_operator_type.c
M	source/blender/windowmanager/intern/wm_operator_utils.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/intern/wm_splash_screen.c
M	source/blender/windowmanager/intern/wm_stereo.c
M	source/blender/windowmanager/intern/wm_subwindow.c
M	source/blender/windowmanager/intern/wm_tooltip.c
M	source/blender/windowmanager/wm.h
M	source/blender/windowmanager/wm_draw.h
M	source/blender/windowmanager/wm_event_system.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index ad8a1b82fd1..6f1f68e1ef2 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -198,7 +198,7 @@ typedef struct bNodeType {
 
   /* Main draw function for the node */
   void (*draw_nodetype)(const struct bContext *C,
-                        struct ARegion *ar,
+                        struct ARegion *region,
                         struct SpaceNode *snode,
                         struct bNodeTree *ntree,
                         struct bNode *node,
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 9db60ced3e0..a6ed1274f19 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -133,19 +133,19 @@ typedef struct ARegionType {
   int regionid; /* unique identifier within this space, defines RGN_TYPE_xxxx */
 
   /* add handlers, stuff you only do once or on area/region type/size changes */
-  void (*init)(struct wmWindowManager *wm, struct ARegion *ar);
+  void (*init)(struct wmWindowManager *wm, struct ARegion *region);
   /* exit is called when the region is hidden or removed */
-  void (*exit)(struct wmWindowManager *wm, struct ARegion *ar);
+  void (*exit)(struct wmWindowManager *wm, struct ARegion *region);
   /* draw entirely, view changes should be handled here */
-  void (*draw)(const struct bContext *C, struct ARegion *ar);
+  void (*draw)(const struct bContext *C, struct ARegion *region);
   /* optional, compute button layout before drawing for dynamic size */
-  void (*layout)(const struct bContext *C, struct ARegion *ar);
+  void (*layout)(const struct bContext *C, struct ARegion *region);
   /* snap the size of the region (can be NULL for no snapping). */
-  int (*snap_size)(const struct ARegion *ar, int size, int axis);
+  int (*snap_size)(const struct ARegion *region, int size, int axis);
   /* contextual changes should be handled here */
   void (*listener)(struct wmWindow *win,
                    struct ScrArea *sa,
-                   struct ARegion *ar,
+                   struct ARegion *region,
                    struct wmNotifier *wmn,
                    const struct Scene *scene);
   /* Optional callback to generate subscriptions. */
@@ -154,7 +154,7 @@ typedef struct ARegionType {
                             struct Scene *scene,
                             struct bScreen *sc,
                             struct ScrArea *sa,
-                            struct ARegion *ar,
+                            struct ARegion *region,
                             struct wmMsgBus *mbus);
 
   void (*free)(struct ARegion *);
@@ -167,7 +167,7 @@ typedef struct ARegionType {
   /* add own items to keymap */
   void (*keymap)(struct wmKeyConfig *keyconf);
   /* allows default cursor per region */
-  void (*cursor)(struct wmWindow *win, struct ScrArea *sa, struct ARegion *ar);
+  void (*cursor)(struct wmWindow *win, struct ScrArea *sa, struct ARegion *region);
 
   /* return context data */
   int (*context)(const struct bContext *C, const char *member, struct bContextDataResult *result);
@@ -340,8 +340,8 @@ void BKE_spacedata_callback_id_remap_set(
 void BKE_spacedata_id_unref(struct ScrArea *sa, struct SpaceLink *sl, struct ID *id);
 
 /* area/regions */
-struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar);
-void BKE_area_region_free(struct SpaceType *st, struct ARegion *ar);
+struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *region);
+void BKE_area_region_free(struct SpaceType *st, struct ARegion *region);
 void BKE_area_region_panels_free(struct ListBase *panels);
 void BKE_screen_area_free(struct ScrArea *sa);
 /* Gizmo-maps of a region need to be freed with the region.
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index e3d95bb660f..48985932d87 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -280,7 +280,7 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
 {
   bScreen *sc;
   ScrArea *sa;
-  ARegion *ar;
+  ARegion *region;
   int done = 0, recursion = C->data.recursion;
   int ret = 0;
 
@@ -318,10 +318,10 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
       done = 1;
     }
   }
-  if (done != 1 && recursion < 2 && (ar = CTX_wm_region(C))) {
+  if (done != 1 && recursion < 2 && (region = CTX_wm_region(C))) {
     C->data.recursion = 2;
-    if (ar->type && ar->type->context) {
-      ret = ar->type->context(C, member, result);
+    if (region->type && region->type->context) {
+      ret = region->type->context(C, member, result);
       if (ret) {
         done = -(-ret | -done);
       }
@@ -545,7 +545,7 @@ ListBase CTX_data_dir_get_ex(const bContext *C,
   ListBase lb;
   bScreen *sc;
   ScrArea *sa;
-  ARegion *ar;
+  ARegion *region;
   int a;
 
   memset(&lb, 0, sizeof(lb));
@@ -578,9 +578,9 @@ ListBase CTX_data_dir_get_ex(const bContext *C,
       data_dir_add(&lb, entry->name, use_all);
     }
   }
-  if ((ar = CTX_wm_region(C)) && ar->type && ar->type->context) {
+  if ((region = CTX_wm_region(C)) && region->type && region->type->context) {
     memset(&result, 0, sizeof(result));
-    ar->type->context(C, "", &result);
+    region->type->context(C, "", &result);
 
     if (result.dir) {
       for (a = 0; result.dir[a]; a++) {
@@ -727,8 +727,8 @@ ARegion *CTX_wm_region(const bContext *C)
 
 void *CTX_wm_region_data(const bContext *C)
 {
-  ARegion *ar = CTX_wm_region(C);
-  return (ar) ? ar->regiondata : NULL;
+  ARegion *region = CTX_wm_region(C);
+  return (region) ? region->regiondata : NULL;
 }
 
 struct ARegion *CTX_wm_menu(const bContext *C)
@@ -767,11 +767,11 @@ View3D *CTX_wm_view3d(const bContext *C)
 RegionView3D *CTX_wm_region_view3d(const bContext *C)
 {
   ScrArea *sa = CTX_wm_area(C);
-  ARegion *ar = CTX_wm_region(C);
+  ARegion *region = CTX_wm_region(C);
 
   if (sa && sa->spacetype == SPACE_VIEW3D) {
-    if (ar && ar->regiontype == RGN_TYPE_WINDOW) {
-      return ar->regiondata;
+    if (region && region->regiontype == RGN_TYPE_WINDOW) {
+      return region->regiondata;
     }
   }
   return NULL;
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 6285aee0ffa..3815cb9f59a 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -54,12 +54,12 @@
 static void screen_free_data(ID *id)
 {
   bScreen *screen = (bScreen *)id;
-  ARegion *ar;
+  ARegion *region;
 
   /* No animdata here. */
 
-  for (ar = screen->regionbase.first; ar; ar = ar->next) {
-    BKE_area_region_free(NULL, ar);
+  for (region = screen->regionbase.first; region; region = region->next) {
+    BKE_area_region_free(NULL, region);
   }
 
   BLI_freelistN(&screen->regionbase);
@@ -204,14 +204,14 @@ bool BKE_spacetype_exists(int spaceid)
 void BKE_spacedata_freelist(ListBase *lb)
 {
   SpaceLink *sl;
-  ARegion *ar;
+  ARegion *region;
 
   for (sl = lb->first; sl; sl = sl->next) {
     SpaceType *st = BKE_spacetype_from_id(sl->spacetype);
 
     /* free regions for pushed spaces */
-    for (ar = sl->regionbase.first; ar; ar = ar->next) {
-      BKE_area_region_free(st, ar);
+    for (region = sl->regionbase.first; region; region = region->next) {
+      BKE_area_region_free(st, region);
     }
 
     BLI_freelistN(&sl->regionbase);
@@ -238,9 +238,9 @@ static void panel_list_copy(ListBase *newlb, const ListBase *lb)
   }
 }
 
-ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
+ARegion *BKE_area_region_copy(SpaceType *st, ARegion *region)
 {
-  ARegion *newar = MEM_dupallocN(ar);
+  ARegion *newar = MEM_dupallocN(region);
 
   newar->prev = newar->next = NULL;
   BLI_listbase_clear(&newar->handlers);
@@ -255,28 +255,28 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
   newar->draw_buffer = NULL;
 
   /* use optional regiondata callback */
-  if (ar->regiondata) {
-    ARegionType *art = BKE_regiontype_from_id(st, ar->regiontype);
+  if (region->regiondata) {
+    ARegionType *art = BKE_regiontype_from_id(st, region->regiontype);
 
     if (art && art->duplicate) {
-      newar->regiondata = art->duplicate(ar->regiondata);
+      newar->regiondata = art->duplicate(region->regiondata);
     }
-    else if (ar->flag & RGN_FLAG_TEMP_REGIONDATA) {
+    else if (region->flag & RGN_FLAG_TEMP_REGIONDATA) {
       newar->regiondata = NULL;
     }
     else {
-      newar->regiondata = MEM_dupallocN(ar->regiondata);
+      newar->regiondata = MEM_dupallocN(region->regiondata);
     }
   }
 
-  if (ar->v2d.tab_offset) {
-    newar->v2d.tab_offset = MEM_dupallocN(ar->v2d.tab_offset);
+  if (region->v2d.tab_offset) {
+    newar->v2d.tab_offset = MEM_dupallocN(region->v2d.tab_offset);
   }
 
-  panel_list_copy(&newar->panels, &ar->panels);
+  panel_list_copy(&newar->panels, &region->panels);
 
   BLI_listbase_clear(&newar->ui_previews);
-  BLI_duplicatelist(&newar->ui_previews, &ar->ui_previews);
+  BLI_duplicatelist(&newar->ui_previews, &region->ui_previews);
 
   return newar;
 }
@@ -284,13 +284,13 @@ ARegion *BKE_area_region_copy(SpaceType *st, ARegion *ar)
 /* from lb2 to lb1, lb1 is supposed to be freed */
 static void region_copylist(SpaceType *st, ListBase *lb1, ListBase *lb2)
 {
-  ARegion *ar;
+  ARegion *region;
 
   /* to be sure */
   BLI_listbase_clear(lb1);
 
-  for (ar = lb2->first; ar; ar = ar->next) {
-    ARegion *arnew = BKE_area_region_copy(st, ar);
+  for (region = lb2->first; region; region = region->next) {
+    ARegion *arnew = BKE_area_region_copy(st, region);
     BLI_addtail(lb1, arnew);
   }
 }
@@ -344,19 +344,19 @@ ARegion *BKE_spacedata_find_region_type(const SpaceLink *slink, const ScrArea *s
 {
   const bool is_slink_active = slink == sa->spacedata.first;
   const ListBase *regionbase = (is_slink_active) ? &sa->regionbase : &slink->regionbase;
-  ARegion *ar = NULL;
+  ARegion *region = NULL;
 
   BLI_assert(BLI_findindex(&sa->spacedata, slink) != -1);
-  for (ar = regionbase->first; ar; ar = ar->next) {
-    if (ar->regiontype == re

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list