[gimp/soc-2009-dynamics] Bail out early if dynamic opacity is 0.0
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp/soc-2009-dynamics] Bail out early if dynamic opacity is 0.0
- Date: Tue, 13 Oct 2009 18:44:47 +0000 (UTC)
commit d4313db29bddb220df791c54522cbee744959566
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 13 20:34:01 2009 +0200
Bail out early if dynamic opacity is 0.0
app/paint/gimpconvolve.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c
index 4a8ff10..3a22005 100644
--- a/app/paint/gimpconvolve.c
+++ b/app/paint/gimpconvolve.c
@@ -129,26 +129,29 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
GimpBrushCore *brush_core = GIMP_BRUSH_CORE (paint_core);
GimpConvolveOptions *options = GIMP_CONVOLVE_OPTIONS (paint_options);
GimpContext *context = GIMP_CONTEXT (paint_options);
+ GimpDynamics *dynamics = GIMP_BRUSH_CORE (paint_core)->dynamics;
GimpImage *image;
TempBuf *area;
PixelRegion srcPR;
PixelRegion destPR;
PixelRegion tempPR;
guchar *buffer;
+ gdouble fade_point;
gdouble opacity;
gdouble rate;
gint bytes;
- gdouble fade_point = gimp_paint_options_get_fade (paint_options, gimp_item_get_image (GIMP_ITEM (drawable)),
- paint_core->pixel_dist);
+ if (gimp_drawable_is_indexed (drawable))
+ return;
image = gimp_item_get_image (GIMP_ITEM (drawable));
- if (gimp_drawable_is_indexed (drawable))
- return;
+ fade_point = gimp_paint_options_get_fade (paint_options, image,
+ paint_core->pixel_dist);
- opacity = gimp_paint_options_get_fade (paint_options, image,
- paint_core->pixel_dist);
+ opacity = gimp_dynamics_output_get_linear_value (dynamics->opacity_output,
+ *coords,
+ fade_point);
if (opacity == 0.0)
return;
@@ -159,7 +162,9 @@ gimp_convolve_motion (GimpPaintCore *paint_core,
rate = options->rate;
- rate *= gimp_dynamics_output_get_linear_value (GIMP_BRUSH_CORE (paint_core)->dynamics->rate_output, *coords, fade_point);
+ rate *= gimp_dynamics_output_get_linear_value (dynamics->rate_output,
+ *coords,
+ fade_point);
gimp_convolve_calculate_matrix (convolve, options->type,
brush_core->brush->mask->width / 2,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]