dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check if the GimpPaintCore really is a GimpBrushCore before catsting and 

2004-05-26  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppainttool.c (gimp_paint_tool_button_press): check
	if the GimpPaintCore really is a GimpBrushCore before catsting and
	fiddling with internaly.
This commit is contained in:
Michael Natterer 2004-05-26 08:45:59 +00:00 committed by Michael Natterer
parent 9a41a73de8
commit 080b503fd0
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-05-26 Michael Natterer <mitch@gimp.org>
* app/tools/gimppainttool.c (gimp_paint_tool_button_press): check
if the GimpPaintCore really is a GimpBrushCore before catsting and
fiddling with internaly.
2004-05-25 Michael Natterer <mitch@gimp.org>
* app/paint/Makefile.am

8
app/tools/gimpbrushtool.c
View File

@ -347,7 +347,7 @@ gimp_paint_tool_button_press (GimpTool *tool,
GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
GimpPaintOptions *paint_options;
GimpPaintCore *core;
GimpBrush *current_brush;
GimpBrush *current_brush = NULL;
GimpDrawable *drawable;
GdkDisplay *gdk_display;
GimpCoords curr_coords;
@ -428,7 +428,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_core_paint (core, drawable, paint_options, INIT_PAINT);
/* store the current brush pointer */
current_brush = GIMP_BRUSH_CORE (core)->brush;
if (GIMP_IS_BRUSH_CORE (core))
current_brush = GIMP_BRUSH_CORE (core)->brush;
if (core->flags & CORE_TRACES_ON_WINDOW)
gimp_paint_core_paint (core, drawable, paint_options, PRETRACE_PAINT);
@ -449,7 +450,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_core_paint (core, drawable, paint_options, POSTTRACE_PAINT);
/* restore the current brush pointer */
GIMP_BRUSH_CORE (core)->brush = current_brush;
if (GIMP_IS_BRUSH_CORE (core))
GIMP_BRUSH_CORE (core)->brush = current_brush;
}
static void

8
app/tools/gimppainttool.c
View File

@ -347,7 +347,7 @@ gimp_paint_tool_button_press (GimpTool *tool,
GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool);
GimpPaintOptions *paint_options;
GimpPaintCore *core;
GimpBrush *current_brush;
GimpBrush *current_brush = NULL;
GimpDrawable *drawable;
GdkDisplay *gdk_display;
GimpCoords curr_coords;
@ -428,7 +428,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_core_paint (core, drawable, paint_options, INIT_PAINT);
/* store the current brush pointer */
current_brush = GIMP_BRUSH_CORE (core)->brush;
if (GIMP_IS_BRUSH_CORE (core))
current_brush = GIMP_BRUSH_CORE (core)->brush;
if (core->flags & CORE_TRACES_ON_WINDOW)
gimp_paint_core_paint (core, drawable, paint_options, PRETRACE_PAINT);
@ -449,7 +450,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_core_paint (core, drawable, paint_options, POSTTRACE_PAINT);
/* restore the current brush pointer */
GIMP_BRUSH_CORE (core)->brush = current_brush;
if (GIMP_IS_BRUSH_CORE (core))
GIMP_BRUSH_CORE (core)->brush = current_brush;
}
static void