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

Dev to master for v3.6.0 #613

Merged
merged 241 commits into from
Aug 8, 2024
Merged

Dev to master for v3.6.0 #613

merged 241 commits into from
Aug 8, 2024

Conversation

TheDuckCow
Copy link
Member

This PR represents the merge into master for the 3.6.0 release. Automated tests are looking good, though I need to cross check whether the 2.80 and 2.90 failures are actual concerns or not. I also want to maintain the philosophy of always doing a full UAT before a release if there have been any code changes since the last UAT (which there were). So, I'll aim to do that tomorrow.

-------------------------------------------------------------------------------
bversion   	ran_tests	ran	skips	failed	errors
-------------------------------------------------------------------------------
(4.2.0)   	all_tests	69	2	0	No errors
(4.0.2)   	all_tests	69	2	0	No errors
(3.6.2)   	all_tests	69	2	0	No errors
(3.5.1)   	all_tests	69	2	0	No errors
(3.4.0)   	all_tests	69	2	0	No errors
(3.3.1)   	all_tests	69	2	0	No errors
(3.2.1)   	all_tests	69	2	0	No errors
(3.1.0)   	all_tests	69	2	0	No errors
(3.0.0)   	all_tests	69	2	0	No errors
(2.93.0)   	all_tests	68	3	0	No errors
(2.90.1)   	all_tests	8	0	8	test_disable_enable;test_enable;asset_qa_test;materials_test;spawner_test;tracker_test;util_test;world_tools_test
(2.80.75)   	all_tests	8	0	8	test_disable_enable;test_enable;asset_qa_test;materials_test;spawner_test;tracker_test;util_test;world_tools_test
tests took 226s to run, ending with code 1

A side goal of this would be to create a UAT template issue which could be used and attached to releases in the future. For now, will just do so manually.

This commit adds the necesary files to create an MCprep release
candidate:
- download_resources.sh: automatically downloads and moves assets
  from the latest stable release of MCprep
- rc-bl_info.patch: patches bl_info for release candidates
Weekly merge of dev for MCprep 3.5 RC-3
While production builds should ignore Release Candidates, release
candidates shouldn't as release candidate updates can introduce
important fixes.
This should be under the patches folder
Weekly updating of the mcprep-rc branch
This patch changes the ID for MCprep RCs so that we don't confuse them
in the tracker.
This patch was used once and will now be removed on the basis that it
would cause more issues then it solves.
This is so we can better organize our scripts
This was something that would have been useful in #505, and now we have
it :D
This is a small change that'll make it easier to understand what's going
on at runtime with regards to the ignore filter
Added error object for better user experience
In the past, we'd set this to a hard coded value. However, that proved
to be annoying to users using non-standard OCIO configs like ACES or
early versions of AgX. MCprep already fixes MTL files for ACES
compatibility, so we're expanding this to prep materials.

In `mcprep_data.json`, there will now be a section called
"non_color_options", which is a list of different options for Non-Color
Data/Generic Data. If a user is using a non-standard setup, they can
simply add the correct option in the JSON file and prep materials will
function properly.

The matching goes in order from first to last, and MCprep will use the
first value matched at runtime.
StandingPadAnimations and others added 27 commits June 25, 2024 00:17
`bv28` was deprecated back in MCprep 3.5. Although it was kept for a
little bit longer then most deprecated functions, we should be good to
go with removing this function as we no longer use it.

Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
…s-patch-1

test: Restrict test action to changes in MCprep_addon
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
Signed-off-by: Mahid Sheikh <mahid@standingpad.org>
…fixes-for-360

Adding a missing filenames test and (commented out solution)
…ded-rig-documentation

Update documentation to included included Warden
…andle-missing-paths

Improved error message when prepping only mats with missing image paths.
Also fixing the name for the test runner on master, which wasn't
triggering before.

All tests pass across all versions of blender I have locally now
…mpatibility

Fixing typing which was breaking blender 2.90 and 2.80 builds
@TheDuckCow
Copy link
Member Author

TheDuckCow commented Aug 7, 2024

Alright I did another round of UAT and found just a couple things - some are quick asset fixes I'll attempt, others can be pursued in follow up updates. I've also used this as a chance to create a draft issue template for UAT testing, which I'll share later as another PR:

  • Default imported fire renders black in eevee, should select alpha clip for both materials. Same for campfire materials (meshswap).
  • The "furnace on" meshswap has a visible white box (probably for particle spawning) which should be changed to not be visible in render (in 4.2 both eevee and cycles)
  • Add MC sky: Could not use the "add sun/moon mesh" option in 2.80 nor in 4.2, this seems pretty important to fix as the option for mesh is basically broken right now (not sure why yet)
  • In blender 2.80: Render pano started with 1/6 done, should have started saying 0/6 done; also is rendering panos just broken entirely? Doesn't seem to go past the first one.
    • Works fine in 4.x though, so really just need to see where no longer working and just disable this niche feature in that version and lower I'd say, rather than spend time fixing
  • Crashing when adding particle effects in 2.80
    • Working fine in 4.2 though, so will consider deprecating the feature in this version and see which b version doesn't crash.

Will see about addressing these today

But on more positive note, tests are looking good:

-------------------------------------------------------------------------------
bversion   	ran_tests	ran	skips	failed	errors
-------------------------------------------------------------------------------
(4.2.0)   	all_tests	69	2	0	No errors
(4.0.2)   	all_tests	69	2	0	No errors
(3.6.2)   	all_tests	69	2	0	No errors
(3.5.1)   	all_tests	69	2	0	No errors
(3.4.0)   	all_tests	69	2	0	No errors
(3.3.1)   	all_tests	69	2	0	No errors
(3.2.1)   	all_tests	69	2	0	No errors
(3.1.0)   	all_tests	69	2	0	No errors
(3.0.0)   	all_tests	69	2	0	No errors
(2.93.0)   	all_tests	68	3	0	No errors
(2.90.1)   	all_tests	68	3	0	No errors
(2.80.75)   	all_tests	67	4	0	No errors
tests took 306s to run, ending with code 0

@TheDuckCow
Copy link
Member Author

I've updated the couple assets locally. I also did a check against the current released version of MCprep, and indeed we also can't add the mesh sun/moon there either (in either Cycles or Eevee; also it's much more broken in general in blender 4.2).

So, it's definitely in the best interest to release this ASAP and just treat the mesh sky as an improvement.

@TheDuckCow TheDuckCow merged commit 9bfa153 into master Aug 8, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants