diff --git a/plug-ins/script-fu/scripts/add-bevel.scm b/plug-ins/script-fu/scripts/add-bevel.scm index f56fa745ed..7b8742ea3f 100644 --- a/plug-ins/script-fu/scripts/add-bevel.scm +++ b/plug-ins/script-fu/scripts/add-bevel.scm @@ -75,7 +75,7 @@ RGB-IMAGE _"Bumpmap" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (selection-exists (car (gimp-selection-bounds image))) (selection 0) @@ -115,20 +115,20 @@ ; Initialise our bumpmap ; (gimp-context-set-background '(0 0 0)) - (gimp-drawable-fill bump-layer BACKGROUND-FILL) + (gimp-drawable-fill bump-layer FILL-BACKGROUND) (while (< index thickness) (set! greyness (/ (* index 255) thickness)) (gimp-context-set-background (list greyness greyness greyness)) ;(gimp-selection-feather image 1) ;Stop the slopey jaggies? - (gimp-edit-bucket-fill bump-layer BG-BUCKET-FILL NORMAL-MODE + (gimp-edit-bucket-fill bump-layer BUCKET-FILL-BG LAYER-MODE-NORMAL 100 0 FALSE 0 0) (gimp-selection-shrink image 1) (set! index (+ index 1)) ) ; Now the white interior (gimp-context-set-background '(255 255 255)) - (gimp-edit-bucket-fill bump-layer BG-BUCKET-FILL NORMAL-MODE + (gimp-edit-bucket-fill bump-layer BUCKET-FILL-BG LAYER-MODE-NORMAL 100 0 FALSE 0 0) ;------------------------------------------------------------ diff --git a/plug-ins/script-fu/scripts/addborder.scm b/plug-ins/script-fu/scripts/addborder.scm index e69bcc58a6..fd1f2eecb7 100644 --- a/plug-ins/script-fu/scripts/addborder.scm +++ b/plug-ins/script-fu/scripts/addborder.scm @@ -105,7 +105,7 @@ (layer (car (gimp-layer-new img width height (car (gimp-drawable-type-with-alpha adraw)) - _"Border Layer" 100 NORMAL-MODE)))) + _"Border Layer" 100 LAYER-MODE-NORMAL)))) (gimp-context-push) (gimp-context-set-antialias FALSE) @@ -120,34 +120,34 @@ ysize) (gimp-image-insert-layer img layer 0 0) - (gimp-drawable-fill layer TRANSPARENT-FILL) + (gimp-drawable-fill layer FILL-TRANSPARENT) (gimp-context-set-background (adjcolor color dvalue)) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_top_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer BACKGROUND-FILL) + (gimp-edit-fill layer FILL-BACKGROUND) (gimp-context-set-background (adjcolor color (/ dvalue 2))) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_left_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer BACKGROUND-FILL) + (gimp-edit-fill layer FILL-BACKGROUND) (gimp-context-set-background (adjcolor color (- 0 (/ dvalue 2)))) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_right_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer BACKGROUND-FILL) + (gimp-edit-fill layer FILL-BACKGROUND) (gimp-context-set-background (adjcolor color (- 0 dvalue))) (gimp-image-select-polygon img CHANNEL-OP-REPLACE 10 (gen_bottom_array xsize ysize owidth oheight width height)) - (gimp-edit-fill layer BACKGROUND-FILL) + (gimp-edit-fill layer FILL-BACKGROUND) (gimp-selection-none img) (gimp-image-undo-group-end img) (gimp-displays-flush) diff --git a/plug-ins/script-fu/scripts/burn-in-anim.scm b/plug-ins/script-fu/scripts/burn-in-anim.scm index 852ec947b8..679605acff 100644 --- a/plug-ins/script-fu/scripts/burn-in-anim.scm +++ b/plug-ins/script-fu/scripts/burn-in-anim.scm @@ -83,7 +83,7 @@ ;--- add an alpha mask for blending and select it (gimp-image-select-item img CHANNEL-OP-REPLACE bl-layer) - (set! bl-mask (car (gimp-layer-create-mask bl-layer ADD-BLACK-MASK))) + (set! bl-mask (car (gimp-layer-create-mask bl-layer ADD-MASK-BLACK))) (gimp-layer-add-mask bl-layer bl-mask) ;--- handle layer geometry @@ -115,7 +115,7 @@ (if (= fadeout TRUE) (begin ; blend with 20% offset to get less transparency in the front - (gimp-edit-blend bl-mask FG-BG-RGB-MODE NORMAL-MODE + (gimp-edit-blend bl-mask BLEND-FG-BG-RGB LAYER-MODE-NORMAL GRADIENT-LINEAR 100 20 REPEAT-NONE FALSE FALSE 0 0 TRUE (+ bl-x-off bl-width) 0 bl-x-off 0) @@ -125,7 +125,7 @@ (if (= fadeout FALSE) (begin (gimp-context-set-foreground '(255 255 255)) - (gimp-edit-bucket-fill bl-mask FG-BUCKET-FILL NORMAL-MODE + (gimp-edit-bucket-fill bl-mask BUCKET-FILL-FG LAYER-MODE-NORMAL 100 255 0 0 0) ) ) @@ -142,7 +142,7 @@ ;--- blend glow color inside the letters (gimp-context-set-foreground glow-color) - (gimp-edit-blend bl-layer FG-TRANSPARENT-MODE NORMAL-MODE + (gimp-edit-blend bl-layer BLEND-FG-TRANSPARENT LAYER-MODE-NORMAL GRADIENT-LINEAR 100 0 REPEAT-NONE FALSE FALSE 0 0 TRUE (+ bl-x-off bl-width) 0 @@ -155,7 +155,7 @@ (gimp-layer-set-lock-alpha bl-layer FALSE) (gimp-selection-feather img corona-width) (gimp-context-set-foreground glow-color) - (gimp-edit-blend bl-layer FG-TRANSPARENT-MODE NORMAL-MODE + (gimp-edit-blend bl-layer BLEND-FG-TRANSPARENT LAYER-MODE-NORMAL GRADIENT-LINEAR 100 0 REPEAT-NONE FALSE FALSE 0 0 TRUE (- (+ bl-x-off bl-width) corona-width) 0 diff --git a/plug-ins/script-fu/scripts/carve-it.scm b/plug-ins/script-fu/scripts/carve-it.scm index f3da6c6c11..5cda3da94d 100644 --- a/plug-ins/script-fu/scripts/carve-it.scm +++ b/plug-ins/script-fu/scripts/carve-it.scm @@ -73,7 +73,7 @@ (bg-height (car (gimp-drawable-height bg-layer))) (bg-type (car (gimp-drawable-type bg-layer))) (bg-image (car (gimp-item-get-image bg-layer))) - (layer1 (car (gimp-layer-new img bg-width bg-height bg-type "Layer1" 100 NORMAL-MODE))) + (layer1 (car (gimp-layer-new img bg-width bg-height bg-type "Layer1" 100 LAYER-MODE-NORMAL))) ) (gimp-context-push) @@ -113,9 +113,9 @@ (gimp-context-set-background '(180 180 180)) (gimp-image-select-item img CHANNEL-OP-REPLACE mask-fat) (gimp-selection-invert img) - (gimp-edit-fill mask-emboss BACKGROUND-FILL) + (gimp-edit-fill mask-emboss FILL-BACKGROUND) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) - (gimp-edit-fill mask-emboss BACKGROUND-FILL) + (gimp-edit-fill mask-emboss FILL-BACKGROUND) (gimp-selection-none img) (set! mask-highlight (car (gimp-channel-copy mask-emboss))) @@ -128,35 +128,35 @@ (gimp-edit-copy mask-shadow) (set! shadow-layer (car (gimp-edit-paste layer1 FALSE))) (gimp-floating-sel-to-layer shadow-layer) - (gimp-layer-set-mode shadow-layer MULTIPLY-MODE) + (gimp-layer-set-mode shadow-layer LAYER-MODE-MULTIPLY) (gimp-edit-copy mask-highlight) (set! highlight-layer (car (gimp-edit-paste shadow-layer FALSE))) (gimp-floating-sel-to-layer highlight-layer) - (gimp-layer-set-mode highlight-layer SCREEN-MODE) + (gimp-layer-set-mode highlight-layer LAYER-MODE-SCREEN) (gimp-edit-copy mask) (set! cast-shadow-layer (car (gimp-edit-paste highlight-layer FALSE))) (gimp-floating-sel-to-layer cast-shadow-layer) - (gimp-layer-set-mode cast-shadow-layer MULTIPLY-MODE) + (gimp-layer-set-mode cast-shadow-layer LAYER-MODE-MULTIPLY) (gimp-layer-set-opacity cast-shadow-layer 75) (plug-in-gauss-rle RUN-NONINTERACTIVE img cast-shadow-layer feather TRUE TRUE) (gimp-layer-translate cast-shadow-layer offx offy) - (set! csl-mask (car (gimp-layer-create-mask cast-shadow-layer ADD-BLACK-MASK))) + (set! csl-mask (car (gimp-layer-create-mask cast-shadow-layer ADD-MASK-BLACK))) (gimp-layer-add-mask cast-shadow-layer csl-mask) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill csl-mask BACKGROUND-FILL) + (gimp-edit-fill csl-mask FILL-BACKGROUND) (set! inset-layer (car (gimp-layer-copy layer1 TRUE))) (gimp-image-insert-layer img inset-layer 0 1) - (set! il-mask (car (gimp-layer-create-mask inset-layer ADD-BLACK-MASK))) + (set! il-mask (car (gimp-layer-create-mask inset-layer ADD-MASK-BLACK))) (gimp-layer-add-mask inset-layer il-mask) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill il-mask BACKGROUND-FILL) + (gimp-edit-fill il-mask FILL-BACKGROUND) (gimp-selection-none img) (gimp-selection-none bg-image) (gimp-levels inset-layer 0 0 255 inset-gamma 0 255) diff --git a/plug-ins/script-fu/scripts/chrome-it.scm b/plug-ins/script-fu/scripts/chrome-it.scm index b3742213b7..ca6b38f5a2 100644 --- a/plug-ins/script-fu/scripts/chrome-it.scm +++ b/plug-ins/script-fu/scripts/chrome-it.scm @@ -100,11 +100,11 @@ (feather (sota-scale size 0.5 chrome-factor)) (brush-size (sota-scale size 0.5 chrome-factor)) (mask (car (gimp-channel-new img width height "Chrome Stencil" 50 '(0 0 0)))) - (bg-layer (car (gimp-layer-new img width height GRAY-IMAGE _"Background" 100 NORMAL-MODE))) - (layer1 (car (gimp-layer-new img banding-width banding-height banding-type _"Layer 1" 100 NORMAL-MODE))) - (layer2 (car (gimp-layer-new img width height GRAYA-IMAGE _"Layer 2" 100 DIFFERENCE-MODE))) - (layer3 (car (gimp-layer-new img width height GRAYA-IMAGE _"Layer 3" 100 NORMAL-MODE))) - (shadow (car (gimp-layer-new img width height GRAYA-IMAGE _"Drop Shadow" 100 NORMAL-MODE))) + (bg-layer (car (gimp-layer-new img width height GRAY-IMAGE _"Background" 100 LAYER-MODE-NORMAL))) + (layer1 (car (gimp-layer-new img banding-width banding-height banding-type _"Layer 1" 100 LAYER-MODE-NORMAL))) + (layer2 (car (gimp-layer-new img width height GRAYA-IMAGE _"Layer 2" 100 LAYER-MODE-DIFFERENCE))) + (layer3 (car (gimp-layer-new img width height GRAYA-IMAGE _"Layer 3" 100 LAYER-MODE-NORMAL))) + (shadow (car (gimp-layer-new img width height GRAYA-IMAGE _"Drop Shadow" 100 LAYER-MODE-NORMAL))) (mask-fs 0) (layer-mask 0) ) @@ -129,8 +129,8 @@ (gimp-context-set-background '(255 255 255)) (gimp-selection-none img) - (gimp-edit-fill layer2 BACKGROUND-FILL) - (gimp-edit-fill layer3 BACKGROUND-FILL) + (gimp-edit-fill layer2 FILL-BACKGROUND) + (gimp-edit-fill layer3 FILL-BACKGROUND) (gimp-edit-clear shadow) (gimp-item-set-visible bg-layer FALSE) @@ -140,9 +140,9 @@ (gimp-context-set-background '(0 0 0)) (gimp-selection-translate img offx1 offy1) (gimp-selection-feather img feather) - (gimp-edit-fill layer2 BACKGROUND-FILL) + (gimp-edit-fill layer2 FILL-BACKGROUND) (gimp-selection-translate img (* 2 offx2) (* 2 offy2)) - (gimp-edit-fill layer3 BACKGROUND-FILL) + (gimp-edit-fill layer3 FILL-BACKGROUND) (gimp-selection-none img) (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) (gimp-invert layer2) @@ -156,11 +156,11 @@ (set! layer1 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) (gimp-curves-spline layer1 HISTOGRAM-VALUE 18 (spline-chrome-it)) - (set! layer-mask (car (gimp-layer-create-mask layer1 ADD-BLACK-MASK))) + (set! layer-mask (car (gimp-layer-create-mask layer1 ADD-MASK-BLACK))) (gimp-layer-add-mask layer1 layer-mask) (gimp-image-select-item img CHANNEL-OP-REPLACE mask) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill layer-mask BACKGROUND-FILL) + (gimp-edit-fill layer-mask FILL-BACKGROUND) (set! layer2 (car (gimp-layer-copy layer1 TRUE))) (gimp-image-insert-layer img layer2 0 0) @@ -171,29 +171,29 @@ (gimp-context-set-background '(0 0 0)) (gimp-selection-feather img (* feather 1.5)) (gimp-selection-translate img (* 2.5 offx1) (* 2.5 offy1)) - (gimp-edit-fill shadow BACKGROUND-FILL) + (gimp-edit-fill shadow FILL-BACKGROUND) (gimp-selection-all img) (gimp-context-set-pattern "Marble #1") - (gimp-edit-bucket-fill bg-layer PATTERN-BUCKET-FILL NORMAL-MODE 100 0 FALSE 0 0) + (gimp-edit-bucket-fill bg-layer BUCKET-FILL-PATTERN LAYER-MODE-NORMAL 100 0 FALSE 0 0) (gimp-selection-none img) (gimp-image-convert-rgb img) - (gimp-color-balance layer1 SHADOWS TRUE + (gimp-color-balance layer1 TRANSFER-SHADOWS TRUE (shadows (rval hc)) (shadows (gval hc)) (shadows (bval hc))) - (gimp-color-balance layer1 MIDTONES TRUE + (gimp-color-balance layer1 TRANSFER-MIDTONES TRUE (midtones (rval hc)) (midtones (gval hc)) (midtones (bval hc))) - (gimp-color-balance layer1 HIGHLIGHTS TRUE + (gimp-color-balance layer1 TRANSFER-HIGHLIGHTS TRUE (highlights (rval hc)) (highlights (gval hc)) (highlights (bval hc))) - (gimp-color-balance layer2 SHADOWS TRUE + (gimp-color-balance layer2 TRANSFER-SHADOWS TRUE (shadows (rval cc)) (shadows (gval cc)) (shadows (bval cc))) - (gimp-color-balance layer2 MIDTONES TRUE + (gimp-color-balance layer2 TRANSFER-MIDTONES TRUE (midtones (rval cc)) (midtones (gval cc)) (midtones (bval cc))) - (gimp-color-balance layer2 HIGHLIGHTS TRUE + (gimp-color-balance layer2 TRANSFER-HIGHLIGHTS TRUE (highlights (rval cc)) (highlights (gval cc)) (highlights (bval cc))) - (gimp-hue-saturation layer2 ALL-HUES 0.0 chrome-lightness chrome-saturation) + (gimp-hue-saturation layer2 HUE-RANGE-ALL 0.0 chrome-lightness chrome-saturation) (gimp-item-set-visible shadow TRUE) (gimp-item-set-visible bg-layer TRUE) diff --git a/plug-ins/script-fu/scripts/circuit.scm b/plug-ins/script-fu/scripts/circuit.scm index c5272423db..3ce7c3eaa9 100644 --- a/plug-ins/script-fu/scripts/circuit.scm +++ b/plug-ins/script-fu/scripts/circuit.scm @@ -73,7 +73,7 @@ type _"Effect layer" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer image effect-layer 0 -1) (gimp-layer-set-offsets effect-layer select-offset-x select-offset-y) diff --git a/plug-ins/script-fu/scripts/clothify.scm b/plug-ins/script-fu/scripts/clothify.scm index b58b5e0860..ecf7c4e798 100644 --- a/plug-ins/script-fu/scripts/clothify.scm +++ b/plug-ins/script-fu/scripts/clothify.scm @@ -9,8 +9,8 @@ (width (car (gimp-drawable-width tdrawable))) (height (car (gimp-drawable-height tdrawable))) (img (car (gimp-image-new width height RGB))) -; (layer-two (car (gimp-layer-new img width height RGB-IMAGE "Y Dots" 100 MULTIPLY-MODE))) - (layer-one (car (gimp-layer-new img width height RGB-IMAGE "X Dots" 100 NORMAL-MODE))) +; (layer-two (car (gimp-layer-new img width height RGB-IMAGE "Y Dots" 100 LAYER-MODE-MULTIPLY))) + (layer-one (car (gimp-layer-new img width height RGB-IMAGE "X Dots" 100 LAYER-MODE-NORMAL))) (layer-two 0) (bump-layer 0) ) @@ -22,12 +22,12 @@ (gimp-image-insert-layer img layer-one 0 0) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill layer-one BACKGROUND-FILL) + (gimp-edit-fill layer-one FILL-BACKGROUND) (plug-in-noisify RUN-NONINTERACTIVE img layer-one FALSE 0.7 0.7 0.7 0.7) (set! layer-two (car (gimp-layer-copy layer-one 0))) - (gimp-layer-set-mode layer-two MULTIPLY-MODE) + (gimp-layer-set-mode layer-two LAYER-MODE-MULTIPLY) (gimp-image-insert-layer img layer-two 0 0) (plug-in-gauss-rle RUN-NONINTERACTIVE img layer-one bx TRUE FALSE) diff --git a/plug-ins/script-fu/scripts/coffee.scm b/plug-ins/script-fu/scripts/coffee.scm index 2b0eba31e8..10e0cc747c 100644 --- a/plug-ins/script-fu/scripts/coffee.scm +++ b/plug-ins/script-fu/scripts/coffee.scm @@ -35,7 +35,7 @@ (set! theStain (car (gimp-layer-new theImage theSize theSize RGBA-IMAGE _"Stain" 100 (if (= inDark TRUE) - DARKEN-ONLY-MODE NORMAL-MODE)))) + LAYER-MODE-DARKEN-ONLY LAYER-MODE-NORMAL)))) (gimp-image-insert-layer theImage theStain 0 0) (gimp-selection-all theImage) @@ -55,7 +55,7 @@ (gimp-context-set-gradient "Coffee") - (gimp-edit-blend theStain CUSTOM-MODE NORMAL-MODE + (gimp-edit-blend theStain BLEND-CUSTOM LAYER-MODE-NORMAL GRADIENT-SHAPEBURST-DIMPLED 100 0 REPEAT-NONE FALSE FALSE 0 0 TRUE 0 0 0 0) diff --git a/plug-ins/script-fu/scripts/contactsheet.scm b/plug-ins/script-fu/scripts/contactsheet.scm index 90cda52457..61586c1331 100644 --- a/plug-ins/script-fu/scripts/contactsheet.scm +++ b/plug-ins/script-fu/scripts/contactsheet.scm @@ -113,7 +113,7 @@ ) (gimp-selection-all img) (gimp-drawable-fill (car (gimp-image-get-active-layer img)) - BACKGROUND-FILL) + FILL-BACKGROUND) (gimp-selection-none img) (set! text-layer (car (gimp-text-fontname img -1 0 0 (string-append _"Contact Sheet " @@ -201,7 +201,7 @@ (set! sheet-layer (car (gimp-layer-new sheet-img sheet-width sheet-height RGB-IMAGE "Background" - 100 NORMAL-MODE))) + 100 LAYER-MODE-NORMAL))) (gimp-image-insert-layer sheet-img sheet-layer 0 0) (init-sheet-img sheet-img sheet-num sheet-width border-y off-y) diff --git a/plug-ins/script-fu/scripts/difference-clouds.scm b/plug-ins/script-fu/scripts/difference-clouds.scm index c63ca7da87..cd667174c0 100644 --- a/plug-ins/script-fu/scripts/difference-clouds.scm +++ b/plug-ins/script-fu/scripts/difference-clouds.scm @@ -38,13 +38,13 @@ ; Create the cloud layer (set! diff-clouds (car (gimp-layer-new image width height type - "Clouds" 100 DIFFERENCE-MODE))) + "Clouds" 100 LAYER-MODE-DIFFERENCE))) ; Add the cloud layer above the current layer (gimp-image-insert-layer image diff-clouds 0 -1) ; Clear the layer (so there are no noise in it) - (gimp-drawable-fill diff-clouds TRANSPARENT-FILL) + (gimp-drawable-fill diff-clouds FILL-TRANSPARENT) ; Selections are relative to the drawable; adjust the final offset (set! offset-x (+ draw-offset-x sel-offset-x)) diff --git a/plug-ins/script-fu/scripts/distress-selection.scm b/plug-ins/script-fu/scripts/distress-selection.scm index 03a0cfc463..70dcef71c1 100644 --- a/plug-ins/script-fu/scripts/distress-selection.scm +++ b/plug-ins/script-fu/scripts/distress-selection.scm @@ -52,12 +52,12 @@ theMode "Distress Scratch Layer" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer theImage theLayer 0 0) (if (= FALSE (car (gimp-selection-is-empty theImage))) - (gimp-edit-fill theLayer BACKGROUND-FILL) + (gimp-edit-fill theLayer FILL-BACKGROUND) ) (gimp-selection-invert theImage) diff --git a/plug-ins/script-fu/scripts/drop-shadow.scm b/plug-ins/script-fu/scripts/drop-shadow.scm index d7f8f9efc9..48ccf9b938 100644 --- a/plug-ins/script-fu/scripts/drop-shadow.scm +++ b/plug-ins/script-fu/scripts/drop-shadow.scm @@ -127,16 +127,16 @@ type "Drop Shadow" shadow-opacity - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-set-active-layer image drawable) (gimp-image-insert-layer image shadow-layer 0 -1) (gimp-layer-set-offsets shadow-layer shadow-offset-x shadow-offset-y)) - (gimp-drawable-fill shadow-layer TRANSPARENT-FILL) + (gimp-drawable-fill shadow-layer FILL-TRANSPARENT) (gimp-context-set-background shadow-color) - (gimp-edit-fill shadow-layer BACKGROUND-FILL) + (gimp-edit-fill shadow-layer FILL-BACKGROUND) (gimp-selection-none image) (gimp-layer-set-lock-alpha shadow-layer FALSE) (if (>= shadow-blur 1.0) (plug-in-gauss-rle RUN-NONINTERACTIVE diff --git a/plug-ins/script-fu/scripts/erase-rows.scm b/plug-ins/script-fu/scripts/erase-rows.scm index b013d8b7f4..99934d6de3 100644 --- a/plug-ins/script-fu/scripts/erase-rows.scm +++ b/plug-ins/script-fu/scripts/erase-rows.scm @@ -18,7 +18,7 @@ (gimp-image-select-rectangle img CHANNEL-OP-REPLACE (+ i position-x) position-y 1 height)) (if (= type 0) (gimp-edit-clear drawable) - (gimp-edit-fill drawable BACKGROUND-FILL)) + (gimp-edit-fill drawable FILL-BACKGROUND)) (loop (+ i 2) max)))))) (loop (if (= which 0) 0 diff --git a/plug-ins/script-fu/scripts/font-map.scm b/plug-ins/script-fu/scripts/font-map.scm index 3183333f78..ff2cddebfd 100644 --- a/plug-ins/script-fu/scripts/font-map.scm +++ b/plug-ins/script-fu/scripts/font-map.scm @@ -79,7 +79,7 @@ GRAY RGB)))) (drawable (car (gimp-layer-new img width height (if (= colors 0) GRAY-IMAGE RGB-IMAGE) - "Background" 100 NORMAL-MODE))) + "Background" 100 LAYER-MODE-NORMAL))) (count 0) (font "") ) @@ -101,7 +101,7 @@ (set! drawable (car (gimp-layer-new img width height (if (= colors 0) GRAYA-IMAGE RGBA-IMAGE) - "Labels" 100 NORMAL-MODE))) + "Labels" 100 LAYER-MODE-NORMAL))) (gimp-image-insert-layer img drawable 0 -1))) (gimp-edit-clear drawable) diff --git a/plug-ins/script-fu/scripts/fuzzyborder.scm b/plug-ins/script-fu/scripts/fuzzyborder.scm index d225c9b290..cefdcadc15 100644 --- a/plug-ins/script-fu/scripts/fuzzyborder.scm +++ b/plug-ins/script-fu/scripts/fuzzyborder.scm @@ -39,7 +39,7 @@ (gimp-selection-shrink inImage inSize) (gimp-selection-invert inImage) (gimp-context-set-background inColor) - (gimp-edit-fill inLayer BACKGROUND-FILL) + (gimp-edit-fill inLayer FILL-BACKGROUND) (gimp-selection-none inImage) ) @@ -69,7 +69,7 @@ RGBA-IMAGE "layer 1" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer theImage theLayer 0 0) @@ -96,7 +96,7 @@ (gimp-selection-invert theImage) (gimp-edit-clear theLayer) (gimp-context-set-background inColor) - (gimp-edit-fill theLayer BACKGROUND-FILL) + (gimp-edit-fill theLayer FILL-BACKGROUND) (gimp-selection-none inImage) (chris-color-edge theImage theLayer inColor 1) diff --git a/plug-ins/script-fu/scripts/gradient-example.scm b/plug-ins/script-fu/scripts/gradient-example.scm index cf85ed1613..1f36ef1953 100644 --- a/plug-ins/script-fu/scripts/gradient-example.scm +++ b/plug-ins/script-fu/scripts/gradient-example.scm @@ -24,7 +24,7 @@ (let* ( (img (car (gimp-image-new width height RGB))) (drawable (car (gimp-layer-new img width height RGB - "Gradient example" 100 NORMAL-MODE))) + "Gradient example" 100 LAYER-MODE-NORMAL))) ; Calculate colors for checkerboard... just like in the gradient editor @@ -47,7 +47,7 @@ ; Render gradient - (gimp-edit-blend drawable CUSTOM-MODE NORMAL-MODE + (gimp-edit-blend drawable BLEND-CUSTOM LAYER-MODE-NORMAL GRADIENT-LINEAR 100 0 REPEAT-NONE gradient-reverse FALSE 0 0 TRUE 0 0 (- width 1) 0) diff --git a/plug-ins/script-fu/scripts/lava.scm b/plug-ins/script-fu/scripts/lava.scm index 1735711cd8..aa7cf8f330 100644 --- a/plug-ins/script-fu/scripts/lava.scm +++ b/plug-ins/script-fu/scripts/lava.scm @@ -74,7 +74,7 @@ type "Lava Layer" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer image lava-layer 0 -1) (gimp-layer-set-offsets lava-layer select-offset-x select-offset-y) diff --git a/plug-ins/script-fu/scripts/line-nova.scm b/plug-ins/script-fu/scripts/line-nova.scm index 1cb5fb374f..ad16ffda7e 100644 --- a/plug-ins/script-fu/scripts/line-nova.scm +++ b/plug-ins/script-fu/scripts/line-nova.scm @@ -87,7 +87,7 @@ ) (set! index (+ index 1)) ) - (gimp-edit-bucket-fill drw FG-BUCKET-FILL NORMAL-MODE 100 0 FALSE 0 0) + (gimp-edit-bucket-fill drw BUCKET-FILL-FG LAYER-MODE-NORMAL 100 0 FALSE 0 0) (if old-selection (begin diff --git a/plug-ins/script-fu/scripts/mkbrush.scm b/plug-ins/script-fu/scripts/mkbrush.scm index 3e745f84f0..2717988975 100644 --- a/plug-ins/script-fu/scripts/mkbrush.scm +++ b/plug-ins/script-fu/scripts/mkbrush.scm @@ -26,7 +26,7 @@ (img (car (gimp-image-new width height GRAY))) (drawable (car (gimp-layer-new img width height GRAY-IMAGE - "MakeBrush" 100 NORMAL-MODE))) + "MakeBrush" 100 LAYER-MODE-NORMAL))) (filename (string-append gimp-directory "/brushes/r" (number->string width) @@ -42,12 +42,12 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(255 255 255)) - (gimp-drawable-fill drawable BACKGROUND-FILL) + (gimp-drawable-fill drawable FILL-BACKGROUND) (gimp-image-select-rectangle img CHANNEL-OP-REPLACE 0 0 width height) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) @@ -84,7 +84,7 @@ (img (car (gimp-image-new widthplus heightplus GRAY))) (drawable (car (gimp-layer-new img widthplus heightplus GRAY-IMAGE - "MakeBrush" 100 NORMAL-MODE))) + "MakeBrush" 100 LAYER-MODE-NORMAL))) (filename (string-append gimp-directory "/brushes/r" (number->string width) @@ -101,7 +101,7 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(255 255 255)) - (gimp-drawable-fill drawable BACKGROUND-FILL) + (gimp-drawable-fill drawable FILL-BACKGROUND) (cond ((< 0 feathering) @@ -115,7 +115,7 @@ ) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) @@ -150,7 +150,7 @@ (img (car (gimp-image-new width height GRAY))) (drawable (car (gimp-layer-new img width height GRAY-IMAGE - "MakeBrush" 100 NORMAL-MODE))) + "MakeBrush" 100 LAYER-MODE-NORMAL))) (filename (string-append gimp-directory "/brushes/e" (number->string width) @@ -167,11 +167,11 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(255 255 255)) - (gimp-drawable-fill drawable BACKGROUND-FILL) + (gimp-drawable-fill drawable FILL-BACKGROUND) (gimp-context-set-background '(0 0 0)) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE 0 0 width height) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) @@ -209,7 +209,7 @@ (img (car (gimp-image-new widthplus heightplus GRAY))) (drawable (car (gimp-layer-new img widthplus heightplus GRAY-IMAGE - "MakeBrush" 100 NORMAL-MODE))) + "MakeBrush" 100 LAYER-MODE-NORMAL))) (filename (string-append gimp-directory "/brushes/e" (number->string width) @@ -227,7 +227,7 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(255 255 255)) - (gimp-drawable-fill drawable BACKGROUND-FILL) + (gimp-drawable-fill drawable FILL-BACKGROUND) (cond ((> feathering 0) ; keep from taking out gimp with stupid entry. (gimp-context-set-feather TRUE) @@ -240,7 +240,7 @@ (gimp-image-select-ellipse img CHANNEL-OP-REPLACE 0 0 width height))) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (file-gbr-save 1 img drawable filename "" spacing name) (gimp-image-delete img) diff --git a/plug-ins/script-fu/scripts/old-photo.scm b/plug-ins/script-fu/scripts/old-photo.scm index 5d0467ad09..aafda6ee42 100644 --- a/plug-ins/script-fu/scripts/old-photo.scm +++ b/plug-ins/script-fu/scripts/old-photo.scm @@ -59,7 +59,7 @@ (let ( (mLayer (car (gimp-layer-new theImage theWidth theHeight RGBA-IMAGE "Mottle" - 100 DARKEN-ONLY-MODE))) + 100 LAYER-MODE-DARKEN-ONLY))) ) (gimp-image-insert-layer theImage mLayer 0 0) diff --git a/plug-ins/script-fu/scripts/perspective-shadow.scm b/plug-ins/script-fu/scripts/perspective-shadow.scm index 7a42146361..785b4b0c25 100644 --- a/plug-ins/script-fu/scripts/perspective-shadow.scm +++ b/plug-ins/script-fu/scripts/perspective-shadow.scm @@ -100,14 +100,14 @@ type "Perspective Shadow" shadow-opacity - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer image shadow-layer 0 -1) (gimp-layer-set-offsets shadow-layer select-offset-x select-offset-y) - (gimp-drawable-fill shadow-layer TRANSPARENT-FILL) + (gimp-drawable-fill shadow-layer FILL-TRANSPARENT) (gimp-context-set-background shadow-color) - (gimp-edit-fill shadow-layer BACKGROUND-FILL) + (gimp-edit-fill shadow-layer FILL-BACKGROUND) (gimp-selection-none image) (if (= allow-resize TRUE) diff --git a/plug-ins/script-fu/scripts/predator.scm b/plug-ins/script-fu/scripts/predator.scm index f8e1fe4e23..ac3dc29471 100644 --- a/plug-ins/script-fu/scripts/predator.scm +++ b/plug-ins/script-fu/scripts/predator.scm @@ -76,7 +76,7 @@ type "glow layer" 100 - NORMAL-MODE)) + LAYER-MODE-NORMAL)) ) (gimp-layer-set-offsets effect-layer select-offset-x select-offset-y) diff --git a/plug-ins/script-fu/scripts/ripply-anim.scm b/plug-ins/script-fu/scripts/ripply-anim.scm index a5932586ca..a97da21cfd 100644 --- a/plug-ins/script-fu/scripts/ripply-anim.scm +++ b/plug-ins/script-fu/scripts/ripply-anim.scm @@ -20,14 +20,14 @@ (car (gimp-drawable-type drawable)) "Ripple Map" 100 - NORMAL-MODE)))) + LAYER-MODE-NORMAL)))) (gimp-context-push) (gimp-image-undo-disable work-image) ; Create a tile-able displacement map in the first layer (gimp-context-set-background '(127 127 127)) (gimp-image-insert-layer work-image map-layer 0 0) - (gimp-edit-fill map-layer BACKGROUND-FILL) + (gimp-edit-fill map-layer FILL-BACKGROUND) (plug-in-noisify RUN-NONINTERACTIVE work-image map-layer FALSE 1.0 1.0 1.0 0.0) (plug-in-tile RUN-NONINTERACTIVE work-image map-layer (* width 3) (* height 3) FALSE) (plug-in-gauss-iir RUN-NONINTERACTIVE work-image map-layer 35 TRUE TRUE) diff --git a/plug-ins/script-fu/scripts/round-corners.scm b/plug-ins/script-fu/scripts/round-corners.scm index d5549fb6e2..039bc8af89 100644 --- a/plug-ins/script-fu/scripts/round-corners.scm +++ b/plug-ins/script-fu/scripts/round-corners.scm @@ -106,8 +106,8 @@ type "Background" 100 - NORMAL-MODE)))) - (gimp-drawable-fill bg-layer BACKGROUND-FILL) + LAYER-MODE-NORMAL)))) + (gimp-drawable-fill bg-layer FILL-BACKGROUND) (gimp-image-insert-layer image bg-layer 0 -1) (gimp-image-raise-item image pic-layer) (if (= shadow-toggle TRUE) diff --git a/plug-ins/script-fu/scripts/select-to-brush.scm b/plug-ins/script-fu/scripts/select-to-brush.scm index ee95a9e183..e6e8982a66 100644 --- a/plug-ins/script-fu/scripts/select-to-brush.scm +++ b/plug-ins/script-fu/scripts/select-to-brush.scm @@ -85,7 +85,7 @@ brush-draw-type "Brush" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer brush-image brush-draw 0 0) @@ -94,8 +94,8 @@ (if (= type GRAYA-IMAGE) (begin (gimp-context-set-background '(255 255 255)) - (gimp-drawable-fill brush-draw BACKGROUND-FILL)) - (gimp-drawable-fill brush-draw TRANSPARENT-FILL) + (gimp-drawable-fill brush-draw FILL-BACKGROUND)) + (gimp-drawable-fill brush-draw FILL-TRANSPARENT) ) (let ((floating-sel (car (gimp-edit-paste brush-draw FALSE)))) diff --git a/plug-ins/script-fu/scripts/select-to-image.scm b/plug-ins/script-fu/scripts/select-to-image.scm index 860d27f1b1..1325f12ee7 100644 --- a/plug-ins/script-fu/scripts/select-to-image.scm +++ b/plug-ins/script-fu/scripts/select-to-image.scm @@ -60,9 +60,9 @@ selection-height image-type))) (set! new-draw (car (gimp-layer-new new-image selection-width selection-height - draw-type "Selection" 100 NORMAL-MODE))) + draw-type "Selection" 100 LAYER-MODE-NORMAL))) (gimp-image-insert-layer new-image new-draw 0 0) - (gimp-drawable-fill new-draw BACKGROUND-FILL) + (gimp-drawable-fill new-draw FILL-BACKGROUND) (let ((floating-sel (car (gimp-edit-paste new-draw FALSE)))) (gimp-floating-sel-anchor floating-sel) diff --git a/plug-ins/script-fu/scripts/select-to-pattern.scm b/plug-ins/script-fu/scripts/select-to-pattern.scm index 6d24fda87e..34ec36b0f7 100644 --- a/plug-ins/script-fu/scripts/select-to-pattern.scm +++ b/plug-ins/script-fu/scripts/select-to-pattern.scm @@ -63,9 +63,9 @@ (set! pattern-draw (car (gimp-layer-new pattern-image selection-width selection-height - pattern-draw-type "Pattern" 100 NORMAL-MODE))) + pattern-draw-type "Pattern" 100 LAYER-MODE-NORMAL))) - (gimp-drawable-fill pattern-draw TRANSPARENT-FILL) + (gimp-drawable-fill pattern-draw FILL-TRANSPARENT) (gimp-image-insert-layer pattern-image pattern-draw 0 0) diff --git a/plug-ins/script-fu/scripts/slide.scm b/plug-ins/script-fu/scripts/slide.scm index 18c4036fcb..900cd0e1d5 100644 --- a/plug-ins/script-fu/scripts/slide.scm +++ b/plug-ins/script-fu/scripts/slide.scm @@ -83,14 +83,14 @@ type "Film" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (bg-layer (car (gimp-layer-new image width height type "Background" 100 - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (pic-layer (car (gimp-image-get-active-drawable image))) (numbera (string-append number "A")) ) @@ -119,12 +119,12 @@ ) ; add the background layer - (gimp-drawable-fill bg-layer BACKGROUND-FILL) + (gimp-drawable-fill bg-layer FILL-BACKGROUND) (gimp-image-insert-layer image bg-layer 0 -1) ; add the film layer (gimp-context-set-background '(0 0 0)) - (gimp-drawable-fill film-layer BACKGROUND-FILL) + (gimp-drawable-fill film-layer FILL-BACKGROUND) (gimp-image-insert-layer image film-layer 0 -1) ; add the text @@ -176,7 +176,7 @@ ; create a mask for the holes and cut them out (let* ( - (film-mask (car (gimp-layer-create-mask film-layer ADD-WHITE-MASK))) + (film-mask (car (gimp-layer-create-mask film-layer ADD-MASK-WHITE))) (hole hole-start) (top-y (* height 0.06)) (bottom-y (* height 0.855)) @@ -202,7 +202,7 @@ ) (gimp-context-set-foreground '(0 0 0)) - (gimp-edit-fill film-mask BACKGROUND-FILL) + (gimp-edit-fill film-mask FILL-BACKGROUND) (gimp-selection-none image) (plug-in-gauss-rle RUN-NONINTERACTIVE image film-mask hole-radius TRUE TRUE) (gimp-threshold film-mask 127 255) diff --git a/plug-ins/script-fu/scripts/test-sphere.scm b/plug-ins/script-fu/scripts/test-sphere.scm index 583c3c3ce3..72c9d85a3e 100644 --- a/plug-ins/script-fu/scripts/test-sphere.scm +++ b/plug-ins/script-fu/scripts/test-sphere.scm @@ -180,7 +180,7 @@ (height (* radius 2.5)) (img (car (gimp-image-new width height RGB))) (drawable (car (gimp-layer-new img width height RGB-IMAGE - "Sphere Layer" 100 NORMAL-MODE))) + "Sphere Layer" 100 LAYER-MODE-NORMAL))) (radians (/ (* light *pi*) 180)) (cx (/ width 2)) (cy (/ height 2)) @@ -205,7 +205,7 @@ (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-foreground sphere-color) (gimp-context-set-background bg-color) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (gimp-context-set-background '(20 20 20)) (if (and @@ -224,14 +224,14 @@ (gimp-context-set-feather-radius 7.5 7.5) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE shadow-x shadow-y shadow-w shadow-h) (gimp-context-set-pattern pattern) - (gimp-edit-bucket-fill drawable PATTERN-BUCKET-FILL MULTIPLY-MODE + (gimp-edit-bucket-fill drawable BUCKET-FILL-PATTERN LAYER-MODE-MULTIPLY 100 0 FALSE 0 0))) (gimp-context-set-feather FALSE) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE (- cx radius) (- cy radius) (* 2 radius) (* 2 radius)) - (gimp-edit-blend drawable FG-BG-RGB-MODE NORMAL-MODE + (gimp-edit-blend drawable BLEND-FG-BG-RGB LAYER-MODE-NORMAL GRADIENT-RADIAL 100 offset REPEAT-NONE FALSE FALSE 0 0 TRUE light-x light-y light-end-x light-end-y) @@ -241,7 +241,7 @@ (gimp-context-set-gradient gradient) (gimp-image-select-ellipse img CHANNEL-OP-REPLACE 10 10 50 50) - (gimp-edit-blend drawable CUSTOM-MODE NORMAL-MODE + (gimp-edit-blend drawable BLEND-CUSTOM LAYER-MODE-NORMAL GRADIENT-LINEAR 100 offset REPEAT-NONE gradient-reverse FALSE 0 0 TRUE 10 10 30 60) diff --git a/plug-ins/script-fu/scripts/unsharp-mask.scm b/plug-ins/script-fu/scripts/unsharp-mask.scm index 5df3d5704a..7972ab634a 100644 --- a/plug-ins/script-fu/scripts/unsharp-mask.scm +++ b/plug-ins/script-fu/scripts/unsharp-mask.scm @@ -11,7 +11,7 @@ (original-layer (car (gimp-layer-new new-image drawable-width drawable-height RGB-IMAGE "Original" - 100 NORMAL-MODE))) + 100 LAYER-MODE-NORMAL))) (original-layer-for-darker 0) (original-layer-for-lighter 0) (blured-layer-for-darker 0) @@ -42,7 +42,7 @@ (set! blured-layer-for-lighter (car (gimp-layer-copy blured-layer-for-darker TRUE))) (gimp-image-insert-layer new-image original-layer-for-darker 0 -1) - (gimp-layer-set-mode original-layer-for-darker SUBTRACT-MODE) + (gimp-layer-set-mode original-layer-for-darker LAYER-MODE-SUBTRACT) (set! darker-layer (car (gimp-image-merge-visible-layers new-image CLIP-TO-IMAGE))) (gimp-item-set-name darker-layer "darker mask") @@ -51,17 +51,17 @@ ;; make lighter mask (gimp-image-insert-layer new-image original-layer-for-lighter 0 -1) (gimp-image-insert-layer new-image blured-layer-for-lighter 0 -1) - (gimp-layer-set-mode blured-layer-for-lighter SUBTRACT-MODE) + (gimp-layer-set-mode blured-layer-for-lighter LAYER-MODE-SUBTRACT) (set! lighter-layer (car (gimp-image-merge-visible-layers new-image CLIP-TO-IMAGE))) (gimp-item-set-name lighter-layer "lighter mask") ;; combine them (gimp-item-set-visible original-layer TRUE) - (gimp-layer-set-mode darker-layer SUBTRACT-MODE) + (gimp-layer-set-mode darker-layer LAYER-MODE-SUBTRACT) (gimp-layer-set-opacity darker-layer mask-opacity) (gimp-item-set-visible darker-layer TRUE) - (gimp-layer-set-mode lighter-layer ADDITION-MODE) + (gimp-layer-set-mode lighter-layer LAYER-MODE-ADDITION) (gimp-layer-set-opacity lighter-layer mask-opacity) (gimp-item-set-visible lighter-layer TRUE) diff --git a/plug-ins/script-fu/scripts/weave.scm b/plug-ins/script-fu/scripts/weave.scm index 28fdb1c1af..e80b4eaa5b 100644 --- a/plug-ins/script-fu/scripts/weave.scm +++ b/plug-ins/script-fu/scripts/weave.scm @@ -46,13 +46,13 @@ (darkness (* 255 (/ (- 100 shadow-darkness) 100))) (img (car (gimp-image-new tile-size tile-size RGB))) (drawable (car (gimp-layer-new img tile-size tile-size RGB-IMAGE - "Weave tile" 100 NORMAL-MODE)))) + "Weave tile" 100 LAYER-MODE-NORMAL)))) (gimp-image-undo-disable img) (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) ; Create main horizontal ribbon @@ -66,7 +66,7 @@ (+ (* 2 ribbon-spacing) ribbon-width) ribbon-width) - (gimp-edit-blend drawable FG-BG-RGB-MODE NORMAL-MODE + (gimp-edit-blend drawable BLEND-FG-BG-RGB LAYER-MODE-NORMAL GRADIENT-BILINEAR 100 (- 100 shadow-depth) REPEAT-NONE FALSE FALSE 0 0 TRUE (/ (+ (* 2 ribbon-spacing) ribbon-width -1) 2) 0 0 0) @@ -80,7 +80,7 @@ ribbon-width (+ (* 2 ribbon-spacing) ribbon-width)) - (gimp-edit-blend drawable FG-BG-RGB-MODE NORMAL-MODE + (gimp-edit-blend drawable BLEND-FG-BG-RGB LAYER-MODE-NORMAL GRADIENT-BILINEAR 100 (- 100 shadow-depth) REPEAT-NONE FALSE FALSE 0 0 TRUE 0 (/ (+ (* 2 ribbon-spacing) ribbon-width -1) 2) 0 0) @@ -165,19 +165,19 @@ (let* ((tile-size (+ (* 2 ribbon-width) (* 2 ribbon-spacing))) (img (car (gimp-image-new tile-size tile-size RGB))) (drawable (car (gimp-layer-new img tile-size tile-size RGB-IMAGE - "Mask" 100 NORMAL-MODE)))) + "Mask" 100 LAYER-MODE-NORMAL)))) (gimp-image-undo-disable img) (gimp-image-insert-layer img drawable 0 0) (gimp-context-set-background '(0 0 0)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (gimp-image-select-rectangle img CHANNEL-OP-REPLACE r1-x1 r1-y1 r1-width r1-height) (gimp-image-select-rectangle img CHANNEL-OP-ADD r2-x1 r2-y1 r2-width r2-height) (gimp-image-select-rectangle img CHANNEL-OP-ADD r3-x1 r3-y1 r3-width r3-height) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (gimp-selection-none img) (gimp-image-undo-enable img) @@ -268,11 +268,11 @@ density orientation) (let* ((drawable (car (gimp-layer-new img width height RGBA-IMAGE - "Threads" 100 NORMAL-MODE))) + "Threads" 100 LAYER-MODE-NORMAL))) (dense (/ density 100.0))) (gimp-image-insert-layer img drawable 0 -1) (gimp-context-set-background '(255 255 255)) - (gimp-edit-fill drawable BACKGROUND-FILL) + (gimp-edit-fill drawable FILL-BACKGROUND) (plug-in-noisify RUN-NONINTERACTIVE img drawable FALSE dense dense dense dense) (plug-in-c-astretch RUN-NONINTERACTIVE img drawable) (cond ((eq? orientation 'horizontal) @@ -298,11 +298,11 @@ (h-layer (create-threads-layer w-img width height thread-length thread-density 'horizontal)) - (h-mask (car (gimp-layer-create-mask h-layer ADD-WHITE-MASK))) + (h-mask (car (gimp-layer-create-mask h-layer ADD-MASK-WHITE))) (v-layer (create-threads-layer w-img width height thread-length thread-density 'vertical)) - (v-mask (car (gimp-layer-create-mask v-layer ADD-WHITE-MASK))) + (v-mask (car (gimp-layer-create-mask v-layer ADD-MASK-WHITE))) (hmask (create-horizontal-mask ribbon-width ribbon-spacing width height)) @@ -319,7 +319,7 @@ (gimp-image-delete hm-img) (gimp-floating-sel-anchor (car (gimp-edit-paste h-mask FALSE))) (gimp-layer-set-opacity h-layer thread-intensity) - (gimp-layer-set-mode h-layer MULTIPLY-MODE) + (gimp-layer-set-mode h-layer LAYER-MODE-MULTIPLY) (gimp-layer-add-mask v-layer v-mask) (gimp-selection-all vm-img) @@ -327,7 +327,7 @@ (gimp-image-delete vm-img) (gimp-floating-sel-anchor (car (gimp-edit-paste v-mask FALSE))) (gimp-layer-set-opacity v-layer thread-intensity) - (gimp-layer-set-mode v-layer MULTIPLY-MODE) + (gimp-layer-set-mode v-layer LAYER-MODE-MULTIPLY) ; Uncomment this if you want to keep the weaving mask image ; (gimp-display-new (car (gimp-image-duplicate w-img))) @@ -375,7 +375,7 @@ (gimp-layer-set-offsets floating-sel (car d-offsets) (cadr d-offsets)) - (gimp-layer-set-mode floating-sel MULTIPLY-MODE) + (gimp-layer-set-mode floating-sel LAYER-MODE-MULTIPLY) (gimp-floating-sel-to-layer floating-sel) ) diff --git a/plug-ins/script-fu/scripts/xach-effect.scm b/plug-ins/script-fu/scripts/xach-effect.scm index 679f97f963..496ff36594 100644 --- a/plug-ins/script-fu/scripts/xach-effect.scm +++ b/plug-ins/script-fu/scripts/xach-effect.scm @@ -65,7 +65,7 @@ (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) - (set! hl-layer (car (gimp-layer-new image image-width image-height type _"Highlight" 100 NORMAL-MODE))) + (set! hl-layer (car (gimp-layer-new image image-width image-height type _"Highlight" 100 LAYER-MODE-NORMAL))) (gimp-image-insert-layer image hl-layer 0 -1) (gimp-selection-none image) @@ -73,17 +73,17 @@ (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) (gimp-context-set-background hl-color) - (gimp-edit-fill hl-layer BACKGROUND-FILL) + (gimp-edit-fill hl-layer FILL-BACKGROUND) (gimp-selection-translate image hl-offset-x hl-offset-y) - (gimp-edit-fill hl-layer BACKGROUND-FILL) + (gimp-edit-fill hl-layer FILL-BACKGROUND) (gimp-selection-none image) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) - (set! mask (car (gimp-layer-create-mask hl-layer ADD-WHITE-MASK))) + (set! mask (car (gimp-layer-create-mask hl-layer ADD-MASK-WHITE))) (gimp-layer-add-mask hl-layer mask) (gimp-context-set-background hl-opacity) - (gimp-edit-fill mask BACKGROUND-FILL) + (gimp-edit-fill mask FILL-BACKGROUND) (set! shadow-layer (car (gimp-layer-new image image-width @@ -91,14 +91,14 @@ type _"Shadow" ds-opacity - NORMAL-MODE))) + LAYER-MODE-NORMAL))) (gimp-image-insert-layer image shadow-layer 0 -1) (gimp-selection-none image) (gimp-edit-clear shadow-layer) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection) (gimp-selection-translate image ds-offset-x ds-offset-y) (gimp-context-set-background ds-color) - (gimp-edit-fill shadow-layer BACKGROUND-FILL) + (gimp-edit-fill shadow-layer FILL-BACKGROUND) (gimp-selection-none image) (plug-in-gauss-rle RUN-NONINTERACTIVE image shadow-layer ds-blur TRUE TRUE) (gimp-image-select-item image CHANNEL-OP-REPLACE active-selection)