[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53545] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: no need to initialize the 2D paint node tree when project painting.
Campbell Barton
ideasman42 at gmail.com
Fri Jan 4 03:54:47 CET 2013
Revision: 53545
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53545
Author: campbellbarton
Date: 2013-01-04 02:54:38 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
no need to initialize the 2D paint node tree when project painting.
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 2013-01-04 02:14:31 UTC (rev 53544)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2013-01-04 02:54:38 UTC (rev 53545)
@@ -5142,15 +5142,13 @@
return 0;
}
}
-
- paint_brush_init_tex(pop->s.brush);
-
+
/* note, if we have no UVs on the derived mesh, then we must return here */
if (pop->mode == PAINT_MODE_3D_PROJECT) {
/* initialize all data from the context */
project_state_init(C, OBACT, &pop->ps);
-
+
paint_brush_init_tex(pop->ps.brush);
pop->ps.source = PROJ_SRC_VIEW;
@@ -5168,6 +5166,9 @@
if (pop->ps.dm == NULL)
return 0;
}
+ else {
+ paint_brush_init_tex(pop->s.brush);
+ }
settings->imapaint.flag |= IMAGEPAINT_DRAWING;
undo_paint_push_begin(UNDO_PAINT_IMAGE, op->type->name,
@@ -5237,8 +5238,6 @@
if (pop->restore_projection)
settings->imapaint.flag &= ~IMAGEPAINT_PROJECT_DISABLE;
- paint_brush_exit_tex(pop->s.brush);
-
settings->imapaint.flag &= ~IMAGEPAINT_DRAWING;
imapaint_canvas_free(&pop->s);
BKE_brush_painter_free(pop->painter);
@@ -5250,6 +5249,8 @@
project_paint_end(&pop->ps);
}
else {
+ paint_brush_exit_tex(pop->s.brush);
+
/* non projection 3d paint, could move into own function of more needs adding */
if (pop->s.dm_release)
pop->s.dm->release(pop->s.dm);
More information about the Bf-blender-cvs
mailing list