[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58284] branches/soc-2013-paint/source/ blender: * Use writedata instead of writestruct.

[Antony Riakiotakis]

Revision: 58284
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58284
Author:   psy-fi
Date:     2013-07-15 19:51:19 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
* Use writedata instead of writestruct.
* Vertex painting did not work due to own mistake in backbuffer
sampling.

Modified Paths:
--------------
    branches/soc-2013-paint/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c

Modified: branches/soc-2013-paint/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenloader/intern/writefile.c	2013-07-15 19:18:48 UTC (rev 58283)
+++ branches/soc-2013-paint/source/blender/blenloader/intern/writefile.c	2013-07-15 19:51:19 UTC (rev 58284)
@@ -2865,7 +2865,7 @@
 			if (palette->id.properties) IDP_WriteProperty(palette->id.properties, wd);
 
 			if (palette->colours)
-				writestruct(wd, DATA, "PaletteColors", palette->num_of_colours, palette->colours);
+				writedata(wd, DATA, palette->num_of_colours, palette->colours);
 		}
 	}
 }

Modified: branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c	2013-07-15 19:18:48 UTC (rev 58283)
+++ branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c	2013-07-15 19:51:19 UTC (rev 58284)
@@ -1327,7 +1327,7 @@
 		/* do nothing */
 	}
 	/* texture paint mode sampling */
-	if (base && (base->object->mode & OB_MODE_TEXTURE_PAINT) &&
+	else if (base && (base->object->mode & OB_MODE_TEXTURE_PAINT) &&
 	             v3d->drawtype > OB_WIRE)
 	{
 		/* do nothing */