[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22568] branches/blender2.5/blender: 2. 5 paint:

[Nicholas Bishop]

Revision: 22568
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22568
Author:   nicholasbishop
Date:     2009-08-17 17:17:45 +0200 (Mon, 17 Aug 2009)

Log Message:
-----------
2.5 paint:

* Fixed texture paint UI

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
    branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c

Modified: branches/blender2.5/blender/release/ui/space_view3d_toolbar.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-08-17 15:05:18 UTC (rev 22567)
+++ branches/blender2.5/blender/release/ui/space_view3d_toolbar.py	2009-08-17 15:17:45 UTC (rev 22568)
@@ -292,7 +292,6 @@
 		
 		settings = self.paint_settings(context)
 		brush = settings.brush
-		paint = context.sculpt_object or context.vertex_paint_object
 
 		if not context.particle_edit_object:
 			col = layout.split().column()

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c	2009-08-17 15:05:18 UTC (rev 22567)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/paint.c	2009-08-17 15:17:45 UTC (rev 22568)
@@ -52,8 +52,7 @@
 		case OB_MODE_WEIGHT_PAINT:
 			return &ts->wpaint->paint;
 		case OB_MODE_TEXTURE_PAINT:
-			break;
-			//return &ts->imapaint->paint;
+			return &ts->imapaint.paint;
 		}
 	}
 
@@ -67,14 +66,14 @@
 
 void paint_brush_set(Paint *p, Brush *br)
 {
-	if(!br) {
+	if(p && !br) {
 		/* Setting to NULL removes the current slot */
 		paint_brush_slot_remove(p);
 	}
-	else {
+	else if(p) {
 		int found = 0;
 	
-		if(p && p->brushes) {
+		if(p->brushes) {
 			int i;
 			
 			/* See if there's already a slot with the brush */