Commit: d977db77cd2583fe7342d4bf3b3e52d0d754f3ab
Author: Antonioya
Date: Fri Jul 27 21:13:48 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd977db77cd2583fe7342d4bf3b3e52d0d754f3ab
UI: Change old Grease Pencil Paper and remove color
Now, the color is always white. We still keep internally the color field
because maybe we reuse it in the future.
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index e397f8171ac..c33290e7bd6 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4726,11 +4726,12 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
view = context.space_data
overlay = view.overlay
- layout.prop(overlay, "use_gpencil_paper", text="Fade 3D Objects")
-
- if overlay.use_gpencil_paper:
- layout.prop(overlay, "gpencil_paper_color", text="Color")
- layout.prop(overlay, "gpencil_paper_opacity", text="Opacity")
+ col = layout.column()
+ row = col.row()
+ row.prop(overlay, "use_gpencil_paper", text="")
+ sub = row.row()
+ sub.active = overlay.use_gpencil_paper
+ sub.prop(overlay, "gpencil_paper_opacity", text="Fade 3D Objects")
layout.prop(overlay, "use_gpencil_grid", text="Show Plane Grid")
if overlay.use_gpencil_grid:
diff --git
a/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
b/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
index 4c4c616a5b4..6832e3a0c80 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
@@ -21,7 +21,7 @@ void main()
}
vec2 coord = vec2(dx * floor(uv.x / dx), dy * floor(uv.y / dy));
- vec4 outcolor = vec4(color);
+ vec4 outcolor = vec4(1, 1, 1, 1); // replace by workspace background
color vec4(color);
/* if paper is disabled, the paper must be full transparent */
if (usepaper == 0) {
outcolor.a = 0;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
