From 0d8d26696f48b710ee2a033f04a76c7826641f05 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 21 Jan 2019 10:41:39 +1100 Subject: [PATCH] Cleanup: trailing space --- release/scripts/startup/bl_ui/space_view3d.py | 24 +++++++++---------- .../blender/blenkernel/intern/library_query.c | 2 +- source/blender/blenloader/intern/readfile.c | 2 +- .../engines/gpencil/gpencil_draw_cache_impl.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index a6002dfaad4..067309b1277 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -245,7 +245,7 @@ class VIEW3D_HT_header(Header): text=lk_name, icon=lk_icon, ) - + if object_mode in {'PAINT_GPENCIL'}: if context.workspace.tools.from_space_view3d_mode(object_mode).name == "Draw": settings = tool_settings.gpencil_sculpt.guide @@ -5331,7 +5331,7 @@ class VIEW3D_PT_gpencil_lock(Panel): col = row.column() col.prop(context.tool_settings.gpencil_sculpt, "lock_axis", expand=True) - + class VIEW3D_PT_gpencil_guide(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'HEADER' @@ -5344,34 +5344,34 @@ class VIEW3D_PT_gpencil_guide(Panel): layout = self.layout layout.label(text="Guides") - + col = layout.column() col.active = settings.use_guide col.prop(settings, "type", expand=True) - + if settings.type in {'PARALLEL'}: col.prop(settings, "angle") row = col.row(align=True) - - col.prop(settings, "use_snapping") + + col.prop(settings, "use_snapping") if settings.use_snapping: - + if settings.type in {'RADIAL'}: col.prop(settings, "angle_snap") else: col.prop(settings, "spacing") - + col.label(text="Reference Point") row = col.row(align=True) - row.prop(settings, "reference_point", expand=True) + row.prop(settings, "reference_point", expand=True) if settings.reference_point in {'CUSTOM'}: - col.prop(settings, "location", text="Custom Location") + col.prop(settings, "location", text="Custom Location") if settings.reference_point in {'OBJECT'}: - col.prop(settings, "reference_object", text="Object Location") + col.prop(settings, "reference_object", text="Object Location") if not settings.reference_object: col.label(text="No object selected, using cursor") - + class VIEW3D_PT_overlay_gpencil_options(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'HEADER' diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index b3ddb186fa5..cec5f275ebe 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -471,7 +471,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call for (TimeMarker *marker = scene->markers.first; marker; marker = marker->next) { CALLBACK_INVOKE(marker->camera, IDWALK_CB_NOP); } - + if (toolsett) { CALLBACK_INVOKE(toolsett->particle.scene, IDWALK_CB_NOP); CALLBACK_INVOKE(toolsett->particle.object, IDWALK_CB_NOP); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 79c8a360c3e..b264b457396 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6016,7 +6016,7 @@ static void lib_link_scene(FileData *fd, Main *main) sce->toolsettings->particle.shape_object = newlibadr(fd, sce->id.lib, sce->toolsettings->particle.shape_object); sce->toolsettings->gp_sculpt.guide.reference_object = newlibadr(fd, sce->id.lib, sce->toolsettings->gp_sculpt.guide.reference_object); - + for (Base *base_legacy_next, *base_legacy = sce->base.first; base_legacy; base_legacy = base_legacy_next) { base_legacy_next = base_legacy->next; diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c index 34740e5e5d0..42a46d396a2 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c @@ -397,7 +397,7 @@ GPUBatch *DRW_gpencil_get_buffer_ctrlpoint_geom(bGPdata *gpd) if (ts->gp_sculpt.guide.use_guide) { totpoints++; } - + static GPUVertFormat format = { 0 }; static uint pos_id, color_id, size_id; if (format.attr_len == 0) {