[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58539] trunk/blender/source/blender: Fix #36225, spacing was halved and set to zero for texture paint brushes that had spacing of 1 .
Antony Riakiotakis
kalast at gmail.com
Tue Jul 23 13:13:39 CEST 2013
Revision: 58539
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58539
Author: psy-fi
Date: 2013-07-23 11:13:39 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-07-23 10:59:29 UTC (rev 58538)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-07-23 11:13:39 UTC (rev 58539)
@@ -42,7 +42,7 @@
* 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
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-07-23 10:59:29 UTC (rev 58538)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-07-23 11:13:39 UTC (rev 58539)
@@ -9487,7 +9487,13 @@
}
}
-
+ 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;
More information about the Bf-blender-cvs
mailing list