[Bf-blender-cvs] [d85026db15a] master: Overlay: Outline: Fix unreported feedback loop when smooth wire is disabled

Clément Foucault noreply at git.blender.org
Fri Mar 27 20:11:51 CET 2020


Commit: d85026db15ab2f638d87951211ebc2b40916199e
Author: Clément Foucault
Date:   Fri Mar 27 20:11:43 2020 +0100
Branches: master
https://developer.blender.org/rBd85026db15ab2f638d87951211ebc2b40916199e

Overlay: Outline: Fix unreported feedback loop when smooth wire is disabled

===================================================================

M	source/blender/draw/engines/overlay/overlay_outline.c

===================================================================

diff --git a/source/blender/draw/engines/overlay/overlay_outline.c b/source/blender/draw/engines/overlay/overlay_outline.c
index 0395f6890bd..142421f58d8 100644
--- a/source/blender/draw/engines/overlay/overlay_outline.c
+++ b/source/blender/draw/engines/overlay/overlay_outline.c
@@ -102,14 +102,18 @@ void OVERLAY_outline_init(OVERLAY_Data *vedata)
 
     if (pd->antialiasing.enabled) {
       GPU_framebuffer_ensure_config(&fbl->outlines_resolve_fb,
-                                    {GPU_ATTACHMENT_NONE,
-                                     GPU_ATTACHMENT_TEXTURE(txl->overlay_color_tx),
-                                     GPU_ATTACHMENT_TEXTURE(txl->overlay_line_tx)});
+                                    {
+                                        GPU_ATTACHMENT_NONE,
+                                        GPU_ATTACHMENT_TEXTURE(txl->overlay_color_tx),
+                                        GPU_ATTACHMENT_TEXTURE(txl->overlay_line_tx),
+                                    });
     }
     else {
-      GPU_framebuffer_ensure_config(
-          &fbl->outlines_resolve_fb,
-          {GPU_ATTACHMENT_TEXTURE(txl->temp_depth_tx), GPU_ATTACHMENT_TEXTURE(dtxl->color)});
+      GPU_framebuffer_ensure_config(&fbl->outlines_resolve_fb,
+                                    {
+                                        GPU_ATTACHMENT_NONE,
+                                        GPU_ATTACHMENT_TEXTURE(dtxl->color_overlay),
+                                    });
     }
   }
 }



More information about the Bf-blender-cvs mailing list