From c8ed6f79b5a7bba56dd1eab6806c21bd606df920 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 23 Jul 2013 11:13:39 +0000 Subject: [PATCH] Fix #36225, spacing was halved and set to zero for texture paint brushes that had spacing of 1. Related to own changes to maintain spacing consistent between 2.67-2.66. --- source/blender/blenkernel/BKE_blender.h | 2 +- source/blender/blenloader/intern/readfile.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 0e4289692cc..a0c2908a646 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -42,7 +42,7 @@ extern "C" { * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 268 -#define BLENDER_SUBVERSION 0 +#define BLENDER_SUBVERSION 1 /* 262 was the last editmesh release but it has compatibility code for bmesh data */ #define BLENDER_MINVERSION 262 diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 50273cb33f3..3d944300443 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9487,7 +9487,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } - + if (!MAIN_VERSION_ATLEAST(main, 268, 1)) { + Brush *brush; + for (brush = main->brush.first; brush; brush = brush->id.next) { + brush->spacing = MAX2(1, brush->spacing); + } + } + { bScreen *sc; Object *ob;