[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27503] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: [#21504] Projection Clone Paint broken
Campbell Barton
ideasman42 at gmail.com
Sun Mar 14 23:44:09 CET 2010
Revision: 27503
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27503
Author: campbellbarton
Date: 2010-03-14 23:43:44 +0100 (Sun, 14 Mar 2010)
Log Message:
-----------
[#21504] Projection Clone Paint broken
own error when adding re-project, broke cloning between 2 UV layers
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2010-03-14 22:30:57 UTC (rev 27502)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2010-03-14 22:43:44 UTC (rev 27503)
@@ -2871,6 +2871,7 @@
if (ps->dm_mtface_clone==NULL || ps->dm_mtface_clone==ps->dm_mtface) {
ps->do_layer_clone = 0;
ps->dm_mtface_clone= NULL;
+ printf("ACK!\n");
}
}
@@ -4567,8 +4568,17 @@
{
Scene *scene= CTX_data_scene(C);
ToolSettings *settings= scene->toolsettings;
- Brush *brush;
+ Brush *brush= paint_brush(&settings->imapaint.paint);
+ /* brush */
+ ps->brush = brush;
+ ps->tool = brush->imagepaint_tool;
+ ps->blend = brush->blend;
+
+ ps->is_airbrush = (brush->flag & BRUSH_AIRBRUSH) ? 1 : 0;
+ ps->is_texbrush = (brush->mtex.tex) ? 1 : 0;
+
+
/* these can be NULL */
ps->v3d= CTX_wm_view3d(C);
ps->rv3d= CTX_wm_region_view3d(C);
@@ -4607,16 +4617,6 @@
if(ps->normal_angle_range <= 0.0f)
ps->do_mask_normal = 0; /* no need to do blending */
-
-
- /* brush */
- brush= paint_brush(&settings->imapaint.paint);
- ps->brush = brush;
- ps->tool = brush->imagepaint_tool;
- ps->blend = brush->blend;
-
- ps->is_airbrush = (brush->flag & BRUSH_AIRBRUSH) ? 1 : 0;
- ps->is_texbrush = (brush->mtex.tex) ? 1 : 0;
}
static int texture_paint_init(bContext *C, wmOperator *op)
More information about the Bf-blender-cvs
mailing list