callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for image_map_tool->image_map also when the preview is switched on,

Browse Source 
2008-01-15  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpimagemaptool.c (gimp_image_map_tool_notify_preview):
	check for image_map_tool->image_map also when the preview is
	switched on, not only when it's switched off.


svn path=/trunk/; revision=24618
This commit is contained in:
Michael Natterer
2008-01-15 14:39:41 +00:00
committed by Michael Natterer
parent 03342ad774
commit c7b8f0599c
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-15 Michael Natterer <mitch@gimp.org>
* app/tools/gimpimagemaptool.c (gimp_image_map_tool_notify_preview):
check for image_map_tool->image_map also when the preview is
switched on, not only when it's switched off.
2008-01-15 Sven Neumann <sven@gimp.org> 2008-01-15 Sven Neumann <sven@gimp.org>
* plug-ins/common/bumpmap.c * plug-ins/common/bumpmap.c

18
app/tools/gimpimagemaptool.c
View File

@ -602,17 +602,17 @@ gimp_image_map_tool_notify_preview (GObject *config,
GimpTool *tool = GIMP_TOOL (image_map_tool); GimpTool *tool = GIMP_TOOL (image_map_tool);
GimpImageMapOptions *options = GIMP_IMAGE_MAP_OPTIONS (config); GimpImageMapOptions *options = GIMP_IMAGE_MAP_OPTIONS (config);
if (options->preview) if (image_map_tool->image_map)
{ {
gimp_tool_control_set_preserve (tool->control, TRUE); if (options->preview)
{
gimp_tool_control_set_preserve (tool->control, TRUE);
gimp_image_map_tool_map (image_map_tool); gimp_image_map_tool_map (image_map_tool);
gimp_tool_control_set_preserve (tool->control, FALSE); gimp_tool_control_set_preserve (tool->control, FALSE);
} }
else else
{
if (image_map_tool->image_map)
{ {
gimp_tool_control_set_preserve (tool->control, TRUE); gimp_tool_control_set_preserve (tool->control, TRUE);
@ -637,7 +637,7 @@ gimp_image_map_tool_preview (GimpImageMapTool *image_map_tool)
tool = GIMP_TOOL (image_map_tool); tool = GIMP_TOOL (image_map_tool);
options = GIMP_IMAGE_MAP_TOOL_GET_OPTIONS (tool); options = GIMP_IMAGE_MAP_TOOL_GET_OPTIONS (tool);
if (options->preview && image_map_tool->image_map) if (image_map_tool->image_map && options->preview)
{ {
gimp_tool_control_set_preserve (tool->control, TRUE); gimp_tool_control_set_preserve (tool->control, TRUE);