Removed 'from-selection'. Reset active layer after calling

2007-09-13  Kevin Cozens  <kcozens@cvs.gnome.org>

	* plug-ins/script-fu/scripts/lava.scm: Removed 'from-selection'.
	Reset active layer after calling gimp-selection-save. Modified
	version of patch from Jakub Friedl which fixes bug #476672. Don't
	add alpha if drawable already has alpha. Minor format changes.

svn path=/trunk/; revision=23534
This commit is contained in:
Kevin Cozens 2007-09-13 20:37:17 +00:00 committed by Kevin Cozens
parent e2fd390432
commit df8ba63817
2 changed files with 26 additions and 15 deletions

View File

@ -1,3 +1,10 @@
2007-09-13 Kevin Cozens <kcozens@cvs.gnome.org>
* plug-ins/script-fu/scripts/lava.scm: Removed 'from-selection'.
Reset active layer after calling gimp-selection-save. Modified
version of patch from Jakub Friedl which fixes bug #476672. Don't
add alpha if drawable already has alpha. Minor format changes.
2007-09-13 Sven Neumann <sven@gimp.org>
* app/gui/Makefile.am

View File

@ -37,7 +37,6 @@
(image-width (car (gimp-image-width image)))
(image-height (car (gimp-image-height image)))
(active-selection)
(from-selection)
(selection-bounds)
(select-offset-x)
(select-offset-y)
@ -48,18 +47,18 @@
)
(gimp-context-push)
(gimp-image-undo-group-start image)
(gimp-layer-add-alpha drawable)
(if (= (car (gimp-drawable-has-alpha drawable)) FALSE)
(gimp-layer-add-alpha drawable)
)
(if (= (car (gimp-selection-is-empty image)) TRUE)
(begin
(gimp-selection-layer-alpha drawable)
(set! active-selection (car (gimp-selection-save image)))
(set! from-selection FALSE))
(begin
(set! from-selection TRUE)
(set! active-selection (car (gimp-selection-save image)))))
(gimp-selection-layer-alpha drawable)
)
(set! active-selection (car (gimp-selection-save image)))
(gimp-image-set-active-layer image drawable)
(set! selection-bounds (gimp-selection-bounds image))
(set! select-offset-x (cadr selection-bounds))
@ -83,12 +82,15 @@
(gimp-edit-clear lava-layer)
(gimp-selection-load active-selection)
(gimp-image-set-active-layer image lava-layer)))
(gimp-image-set-active-layer image lava-layer)
)
)
(set! active-layer (car (gimp-image-get-active-layer image)))
(if (= current-grad FALSE)
(gimp-context-set-gradient gradient))
(gimp-context-set-gradient gradient)
)
(plug-in-solid-noise 1 image active-layer FALSE TRUE seed 2 2 2)
(plug-in-cubism 1 image active-layer tile_size 2.5 0)
@ -98,14 +100,16 @@
(plug-in-gradmap 1 image active-layer)
(if (= keep-selection FALSE)
(gimp-selection-none image))
(gimp-selection-none image)
)
(gimp-image-set-active-layer image drawable)
(gimp-image-remove-channel image active-selection)
(gimp-image-undo-group-end image)
(gimp-displays-flush)
(gimp-image-undo-group-end image)
(gimp-context-pop)
(gimp-displays-flush)
)
)