Note: This is an archived version of the Blender Developer Wiki (archived 2024). The current developer documentation is available on developer.blender.org/docs.

User:JesterKing/CyclesRepositorySyncing

Notes on syncing Cycles repository

2020.01.14

00:03 - nvm, I realized that I think I already know what the problem is: need to adapt the application to do the new tricks Cycles can, like ensure a display pass is set

2020.01.13

After some back and forth between different ways of automatically detecting potentially failing patches there was still at least one patch failing, namely support for tiled images and UDIM naming scheme.

Only today I realized that a patch was missing from the Cycles stand-alone repository, one that should have been synced on August 22nd, but for some reason was left out. The patch in question is Merge per-shader SVM nodes in the main update thread to avoid locking. I don't know really why this was missing, but hacking the sync script a bit to also take this one along made all patches apply nicely.

Now back up a bit, divvy up the patches according releases and put in-between Cycles version commits. They'll be missing from the Blender repository, but prior to releasing 2.82 we can ensure that both Blender and Cycles stand-alone agree again wrt versioning.

Still need to compile the stand-alone and ensure that it starts properly.

23:59 - finally compiled, but running on MacOS gives images with full transparency. Need to test on Windows and Linux still.

2020.01.08

  • realization: check with is in stabilization branch and what is added to master during bcon1 while stabilization branch exists.
    • in theory all commits in stabilization branch should also be in master due to merging

(note: linked ranges are for whole repo, need to pick out cycles commits from these)


Steps

  1. standalone: commit Cycles version 1.10.0
  2. standalone: tag v1.10.0
  3. standalone: apply Cycles patches c6f8ea7b45af..v2.81
  4. standalone: commit Cycles version 1.11.0
  5. standalone: tag v1.11.0
  6. standalone: apply Cycles patches v2.81..v2.81a
  7. standalone: tag v1.11.1 (no commits to cycles between v2.81..v2.81a)
  8. standalone: apply Cycles patches v2.81a..master(HEAD)
  9. blender: commit Cycles version v1.12.0 ? or wait until prior to actual release in February?
  10. source/tools: update cycles_commits_sync.py

At the moment of writing master head is 010c551257d5, good for 137 patches to check and sync.


scratchpad text, this isn't the droid you're looking for.

  • v2.80 tag was created on July 15th, 2019. No version bump was made. Should have been: 1.10.0.
  • currently Cycles standalone repo is at 89cb9a6f74b2, corresponding to Blender repo c6f8ea7b45af. Difference between v2.80 tag and last synced commit: v2.80..c6f8ea7b45af
    • should insert Cycles version commit 1.10.0 in stand-alone before applying patches from last synced to v2.81
  • last commit in v2.80 tag blender.git: 65168825e0b0
  • last synced commit until v2.81 tag in blender.git: c6f8ea7b45af..v2.81
    • should insert Cycles version commit 1.11.0 in stand-alone before applying patches from v2.81a till current head.
  • commits in blender.git between v2.81 and v2.81a: v2.81..v2.81a


Before moving to bcon3 commit 1.12.0 in blender repository? Probably not, looks like just need to bump Cycles version as part of release day.

Retrieved from "https://wiki.blender.org/w/index.php?title=User:JesterKing/CyclesRepositorySyncing&oldid=14118"