[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17805] branches/projection-paint/source/ blender: minor changes

[Campbell Barton]

Revision: 17805
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17805
Author:   campbellbarton
Date:     2008-12-12 19:31:34 +0100 (Fri, 12 Dec 2008)

Log Message:
-----------
minor changes

Modified Paths:
--------------
    branches/projection-paint/source/blender/makesdna/DNA_scene_types.h
    branches/projection-paint/source/blender/src/buttons_editing.c
    branches/projection-paint/source/blender/src/imagepaint.c

Modified: branches/projection-paint/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/projection-paint/source/blender/makesdna/DNA_scene_types.h	2008-12-12 17:56:19 UTC (rev 17804)
+++ branches/projection-paint/source/blender/makesdna/DNA_scene_types.h	2008-12-12 18:31:34 UTC (rev 17805)
@@ -346,7 +346,7 @@
 	struct Brush *brush;
 	short flag, tool;
 	
-	/* for projection painting only - todo - use flags */
+	/* for projection painting only */
 	short seam_bleed,normal_angle;
 } ImagePaintSettings;
 

Modified: branches/projection-paint/source/blender/src/buttons_editing.c
===================================================================
--- branches/projection-paint/source/blender/src/buttons_editing.c	2008-12-12 17:56:19 UTC (rev 17804)
+++ branches/projection-paint/source/blender/src/buttons_editing.c	2008-12-12 18:31:34 UTC (rev 17805)
@@ -5020,7 +5020,7 @@
 			if (G.obedit || me) {
 				CustomData *fdata= (G.obedit)? &em->fdata: &me->fdata;
 				CustomData_set_layer_mask(fdata, CD_MTFACE, acttface_mask-1);
-				BIF_undo_push("Set Mask UV Texture");
+				BIF_undo_push("Set Stencil UV Texture");
 				allqueue(REDRAWBUTSEDIT, 0);
 			}
 			break;
@@ -6393,7 +6393,7 @@
 				uiDefButBitS(block, TOGN|BIT, IMAGEPAINT_PROJECT_BACKFACE, B_NOP, "Cull",	xco+10+butw/2,yco-45,butw/2,19, &settings->imapaint.flag, 0, 0, 0, 0, "Ignore faces pointing away from the view (faster)");
 				
 				uiDefButBitS(block, TOGN|BIT, IMAGEPAINT_PROJECT_FLAT, B_NOP, "Normal",	xco+10,yco-65,butw/2,19, &settings->imapaint.flag, 0, 0, 0, 0, "Paint most on faces pointing towards the view");
-				uiDefButS(block, NUM, B_NOP, "", xco+10 +(butw/2),yco-65,butw/2,19, &settings->imapaint.normal_angle, 10.0, 90.0, 0, 0, "Paint most on faces pointing towards the view acording to this angle)");
+				uiDefButS(block, NUM, B_NOP, "", xco+10 +(butw/2),yco-65,butw/2,19, &settings->imapaint.normal_angle, 10.0, 90.0, 0, 0, "Paint most on faces pointing towards the view acording to this angle");
 				
 				uiDefButS(block, NUM, B_NOP, "Bleed: ", xco+10,yco-85,butw,19, &settings->imapaint.seam_bleed, 0.0, 8.0, 0, 0, "Extend paint beyond the faces UVs to reduce seams (in pixels, slower)");
 				uiBlockEndAlign(block);

Modified: branches/projection-paint/source/blender/src/imagepaint.c
===================================================================
--- branches/projection-paint/source/blender/src/imagepaint.c	2008-12-12 17:56:19 UTC (rev 17804)
+++ branches/projection-paint/source/blender/src/imagepaint.c	2008-12-12 18:31:34 UTC (rev 17805)
@@ -65,7 +65,6 @@
 #include "DNA_space_types.h"
 #include "DNA_userdef_types.h"
 #include "DNA_view3d_types.h"
-#include "DNA_gpencil_types.h"
 
 #include "BKE_brush.h"
 #include "BKE_global.h"
@@ -92,7 +91,6 @@
 
 #include "BDR_imagepaint.h"
 #include "BDR_vpaint.h"
-#include "BDR_gpencil.h"
 #include "GPU_draw.h"
 
 #include "GHOST_Types.h"
@@ -4318,7 +4316,6 @@
 	else return 0;
 }
 
-/* this is only useful for debugging at the moment */
 static void imapaint_paint_stroke(ImagePaintState *s, BrushPainter *painter, short texpaint, short *prevmval, short *mval, double time, float pressure)
 {
 	Image *newimage = NULL;