Commit 4e4c1cd5 authored by Ell's avatar Ell
Browse files

Bug 790810 - Nested layer groups lead to a deadlock with multithreading

Use gimp:buffer-source-validate, introduced in the previous commit,
for the source node of GimpDrawables.  This avoids threading issues
with layer groups, or any other drawables that may use a validating
buffer, by making sure the buffer is validated before any
succeeding operations, and hence the associated graph is processed
on the same thread as the parent composition.

Restore multithreaded processing in GimpOperationLayerMode.
parent dec2375a
......@@ -912,7 +912,7 @@ gimp_drawable_real_get_source_node (GimpDrawable *drawable)
drawable->private->buffer_source_node =
gegl_node_new_child (NULL,
"operation", "gegl:buffer-source",
"operation", "gimp:buffer-source-validate",
"buffer", gimp_drawable_get_buffer (drawable),
NULL);
......
......@@ -152,10 +152,6 @@ gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass)
klass->process = gimp_operation_layer_mode_real_process;
klass->get_affected_region = NULL;
/* XXX: temporarily disable multithreaded compositing. see bug #790810. */
if (! g_getenv ("GIMP_MULTITHREADED_COMPOSITING"))
operation_class->threaded = FALSE;
g_object_class_install_property (object_class, PROP_LAYER_MODE,
g_param_spec_enum ("layer-mode",
NULL, NULL,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment