Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blender 2.9 LTS support #2082

Merged
merged 79 commits into from
May 10, 2021
Merged

Blender 2.9 LTS support #2082

merged 79 commits into from
May 10, 2021

Conversation

MoritzBrueckner
Copy link
Collaborator

@MoritzBrueckner MoritzBrueckner commented Jan 4, 2021

This is the main pull request for the transition to the upcoming Blender 2.9 LTS versions (issue). It will be in draft status as long as we're working on the migration and maybe even add some more features.

When contributing to the blender2.9 branch, please link to this pull request so that all related PRs are listed below this post. Thanks!

Checklist of critical tasks:

The entire checklist of tasks can be found here: https://docs.google.com/spreadsheets/d/1uQsNnC2zD-NVYmVETWPj_or23QykmJkbRaSZDML5nHY/edit?usp=sharing

Additional, non-critical changes:

Requires:

armory3d/iron#121.

@MoritzBrueckner MoritzBrueckner added the Blender 2.93 LTS Issues and PRs linked to Blender 2.93 LTS support label Jan 4, 2021
luboslenco and others added 2 commits January 5, 2021 13:12
[Blender 2.9] Nishita sky model & (ir)radiance support for all world shaders
MoritzBrueckner and others added 3 commits April 3, 2021 14:12
# Conflicts:
#	blender/arm/material/shader.py
#	blender/arm/props_collision_filter_mask.py
#	blender/arm/props_ui.py
[Blender 2.9] Resolve merge conflicts
[Blender 2.9] Slightly improve debug console panel UI
@MoritzBrueckner MoritzBrueckner marked this pull request as ready for review May 8, 2021 21:57
@MoritzBrueckner
Copy link
Collaborator Author

Hi @luboslenco, I think this PR and armory3d/armsdk#21 are ready to merge if you agree :) Blender 2.93 LTS is scheduled for late May, so if everything goes according to plan the next Armory SDK can then support 2.9.

@MoritzBrueckner MoritzBrueckner changed the title Blender 2.9 LTS support [draft] Blender 2.9 LTS support May 8, 2021
@luboslenco luboslenco merged commit 98eeccd into master May 10, 2021
@luboslenco
Copy link
Member

Super cool, thanks once again!

@MoritzBrueckner MoritzBrueckner deleted the blender2.9 branch May 10, 2021 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Blender 2.93 LTS Issues and PRs linked to Blender 2.93 LTS support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants