Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 7161eb21ca57
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ae0222c27ed0
Choose a head ref
  • 4 commits
  • 1 file changed
  • 4 contributors

Commits on Feb 25, 2020

  1. blender: 2.81a -> 2.82 

    (cherry picked from commit 8a2c2e4)

cc #80155
    @r-ryantm @veprbl
    r-ryantm authored and veprbl committed Feb 25, 2020
    Copy the full SHA
    879ce0f View commit details
    Browse the repository at this point in the history

  2. blender: fix build on darwin 

    We don't compile blender with alembic. The linux build is able to detect
that, but this is not done for darwin. This explicitly disables alembic
to fix blender build on darwin.

(cherry picked from commit ac56038)

cc #80155
    @veprbl
    veprbl committed Feb 25, 2020
    Copy the full SHA
    ae9aa3c View commit details
    Browse the repository at this point in the history

  3. blender: enable alembic 

    (cherry picked from commit 128c999)

cc #80155
    @gebner @veprbl
    gebner authored and veprbl committed Feb 25, 2020
    Copy the full SHA
    d0a5142 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #81036 from veprbl/pr/blender_2_82_backport 

    [20.03] blender: 2.81a -> 2.82
    @lsix
    lsix committed Feb 25, 2020
    Copy the full SHA
    ae0222c View commit details
    Browse the repository at this point in the history