diff --git a/CairoMakie/Project.toml b/CairoMakie/Project.toml index e3ea1a90ee1..d5f33761b6f 100644 --- a/CairoMakie/Project.toml +++ b/CairoMakie/Project.toml @@ -1,7 +1,7 @@ name = "CairoMakie" uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" author = ["Simon Danisch "] -version = "0.8.12" +version = "0.8.13" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -22,7 +22,7 @@ FFTW = "1" FileIO = "1.1" FreeType = "3, 4.0" GeometryBasics = "0.4.1" -Makie = "=0.17.12" +Makie = "=0.17.13" julia = "1.3" [extras] diff --git a/GLMakie/Project.toml b/GLMakie/Project.toml index d4291c76989..f84e65f57f6 100644 --- a/GLMakie/Project.toml +++ b/GLMakie/Project.toml @@ -1,6 +1,6 @@ name = "GLMakie" uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a" -version = "0.6.12" +version = "0.6.13" [deps] ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" @@ -29,7 +29,7 @@ FixedPointNumbers = "0.7, 0.8" FreeTypeAbstraction = "0.8, 0.9" GLFW = "3" GeometryBasics = "0.4.1" -Makie = "=0.17.12" +Makie = "=0.17.13" MeshIO = "0.4" ModernGL = "1" Observables = "0.5.1" diff --git a/GLMakie/src/GLAbstraction/GLRenderObject.jl b/GLMakie/src/GLAbstraction/GLRenderObject.jl index ba12d4018a3..284695c5397 100644 --- a/GLMakie/src/GLAbstraction/GLRenderObject.jl +++ b/GLMakie/src/GLAbstraction/GLRenderObject.jl @@ -56,7 +56,7 @@ function (sp::StandardPrerender)() glBlendFunci(0, GL_ONE, GL_ONE) # buffer 1 is objectid, do nothing - glDisablei(1, GL_BLEND) + glDisablei(GL_BLEND, 1) # buffer 2 is color.a, should do product # destination <- 0 * source + (source) * destination diff --git a/MakieCore/Project.toml b/MakieCore/Project.toml index b349d7fb654..7dba1661291 100644 --- a/MakieCore/Project.toml +++ b/MakieCore/Project.toml @@ -1,7 +1,7 @@ authors = ["Simon Danisch"] name = "MakieCore" uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b" -version = "0.3.6" +version = "0.4.0" [deps] Observables = "510215fc-4207-5dde-b226-833fc4488ee2" diff --git a/NEWS.md b/NEWS.md index 4bf232b7408..a9214edc403 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,17 @@ ## master +## v0.17.13 + +- Fix boundingboxes [#2184](https://github.com/JuliaPlots/Makie.jl/pull/2184). +- Fix highclip/lowclip in meshscatter, poly, contourf, barplot [#2183](https://github.com/JuliaPlots/Makie.jl/pull/2183). +- fix gridline updates [#2196](https://github.com/JuliaPlots/Makie.jl/pull/2196). +- fix glDisablei argument order, which crashed some Intel drivers + +## v0.17.12 + +- Fix stackoverflow in show [#2167](https://github.com/JuliaPlots/Makie.jl/pull/2167) + ## v0.17.11 - `rainclouds`(!) now supports `violin_limits` keyword argument, serving the same. diff --git a/Project.toml b/Project.toml index 0fe8c66623d..1529e196f43 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Makie" uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" authors = ["Simon Danisch", "Julius Krumbiegel"] -version = "0.17.12" +version = "0.17.13" [deps] Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340" @@ -71,7 +71,7 @@ IntervalSets = "0.3, 0.4, 0.5, 0.6, 0.7" Isoband = "0.1" KernelDensity = "0.5, 0.6" LaTeXStrings = "1.2" -MakieCore = "0.3.6" +MakieCore = "=0.4.0" Match = "1.1" MathTeXEngine = "0.4" Observables = "0.5.1" diff --git a/RPRMakie/Project.toml b/RPRMakie/Project.toml index e355f52985f..4d85800fb73 100644 --- a/RPRMakie/Project.toml +++ b/RPRMakie/Project.toml @@ -17,7 +17,7 @@ julia = "1.3" Colors = "0.9, 0.10, 0.11, 0.12" FileIO = "1.6" GeometryBasics = "0.4.1" -Makie = "=0.17.12" +Makie = "=0.17.13" RadeonProRender = "0.2.1" [extras] diff --git a/WGLMakie/Project.toml b/WGLMakie/Project.toml index 35e6485c63d..9a834ef7b8d 100644 --- a/WGLMakie/Project.toml +++ b/WGLMakie/Project.toml @@ -1,7 +1,7 @@ name = "WGLMakie" uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008" authors = ["SimonDanisch "] -version = "0.6.12" +version = "0.6.13" [deps] Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" @@ -26,7 +26,7 @@ GeometryBasics = "0.4.1" Hyperscript = "0.0.3, 0.0.4" ImageMagick = "1.1" JSServe = "1.2.7" -Makie = "=0.17.12" +Makie = "=0.17.13" Observables = "0.5.1" RelocatableFolders = "0.1, 0.2, 0.3" ShaderAbstractions = "0.2.1"