[Bf-blender-cvs] [123744e432c] master: Cleanup: unused function, spelling

Campbell Barton noreply at git.blender.org
Thu Dec 12 23:21:13 CET 2019


Commit: 123744e432cbdad77b251686b67d18dd190b8204
Author: Campbell Barton
Date:   Fri Dec 13 09:03:07 2019 +1100
Branches: master
https://developer.blender.org/rB123744e432cbdad77b251686b67d18dd190b8204

Cleanup: unused function, spelling

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

M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/gpu/intern/gpu_draw.c

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

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 5b063655f75..03582990703 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -119,20 +119,6 @@ static bScreen *screen_parent_find(const bScreen *screen)
   return NULL;
 }
 
-static int cmp_image_tile(const void *a, const void *b)
-{
-  const ImageTile *tile_a = a;
-  const ImageTile *tile_b = b;
-
-  if (tile_a->tile_number < tile_b->tile_number) {
-    return -1;
-  }
-  if (tile_a->tile_number > tile_b->tile_number) {
-    return 1;
-  }
-  return 0;
-}
-
 static void do_version_workspaces_create_from_screens(Main *bmain)
 {
   for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 061977d0c91..bb605c6cbae 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1280,8 +1280,8 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d, int xoffset, int *yoffs
 }
 
 /**
- * draw info beside axes in bottom left-corner:
- * framenum, collection, object name, bone name (if available), marker name (if available)
+ * Draw info beside axes in bottom left-corner:
+ * frame-number, collection, object name, bone name (if available), marker name (if available).
  */
 
 static void draw_selected_name(
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 2d70ce009e2..d698db45b7a 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -482,7 +482,7 @@ GPUTexture *GPU_texture_from_blender(Image *ima, ImageUser *iuser, int textarget
     /* TODO(lukas): When a tile gets deleted, the materials using the image
      * aren't rebuilt and therefore continue to use it.
      * This workaround isn't ideal, the result should be a pink color
-     * (for a missing tile). With the current behaviour, new tiles also won't
+     * (for a missing tile). With the current behavior, new tiles also won't
      * be detected. */
     tile = BKE_image_get_tile(ima, 0);
   }



More information about the Bf-blender-cvs mailing list