[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47640] branches/soc-2012-bratwurst/source /blender: Texture rake brushes

[Antony Riakiotakis]

Revision: 47640
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47640
Author:   psy-fi
Date:     2012-06-09 12:56:54 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
Texture rake brushes
====================
* User angle option now usable.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
    
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c

Modified: branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c        
2012-06-09 11:34:22 UTC (rev 47639)
+++ branches/soc-2012-bratwurst/source/blender/blenkernel/intern/brush.c        
2012-06-09 12:56:54 UTC (rev 47640)
@@ -1136,7 +1136,7 @@
                painter->firsttouch = 0;
                painter->lastpaintpos[0] = pos[0];
                painter->lastpaintpos[1] = pos[1];
-               painter->rotation = 0;
+               painter->rotation = brush->mtex.rot;
        }
 #if 0
        else if (painter->brush->flag & BRUSH_AIRBRUSH) {
@@ -1193,6 +1193,7 @@
                                float angle;
                                angle = acos(dmousepos[0]);
                                painter->rotation = (dmousepos[1] > 0)? angle : 
-angle;
+                               painter->rotation += brush->mtex.rot;
                        }
                }
 

Modified: 
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- 
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c   
    2012-06-09 11:34:22 UTC (rev 47639)
+++ 
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c   
    2012-06-09 12:56:54 UTC (rev 47640)
@@ -4404,10 +4404,6 @@
 
        imapaint_convert_brushco(ibufb, pos, bpos);
 
-       /* prints coordinates in image pixel space */
-       print_v2("position", pos);
-       print_v2("last position", lastpos);
-
        /* lift from canvas */
        if (s->tool == PAINT_TOOL_SOFTEN) {
                imapaint_lift_soften(s->canvas, ibufb, bpos, torus);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs