Port to 2.78 - 0.8.0 changes

Reiner's picture
Project: 
Bforartists Tracker

The port to Blender 2.78 featureset is in progress. We need to go through the single commits, and check and reapply them one by one now when needed. But also revert some.

The changes for Bforartists 0.8.0 needs to be readded. The release note is here: http://www.bforartists.de/wiki/bforartistsreleasenotev080

Status: 
Closed (fixed)
Priority: 
Normal
Category: 
Task
Component: 
Code
Assigned: 
Unassigned
Reporter: 
Created: 
Thu, 02/02/2017 - 18:51
Updated: 
Sat, 02/04/2017 - 11:51

Comments

8
Reiner's picture

Port to 2.78 - 0.8.0 changes - Added icons for the Image toolbar UV common
    https://github.com/Bforartists/Bforartists/commit/4df868c31023f06e4fa28e...

Port to 2.78 - 0.8.0 changes - Added load save icons in the Text file menu.
    https://github.com/Bforartists/Bforartists/commit/83e0a326c851764e0bdbc5...

Port to 2.78 - 0.8.0 changes - Added some load save icons in the Image menu of the UV Image Editor.
    https://github.com/Bforartists/Bforartists/commit/30b605df76706911e960ec...

Port to 2.78 - 0.8.0 changes - fFxex some tooltips in screen_ops.c
    https://github.com/Bforartists/Bforartists/commit/8e7c1b718d002c5b17e091...
    
Port to 2.78 - 0.8.0 changes - Extended the toolbar functionality. Complete toolbar types are now hideable
    https://github.com/Bforartists/Bforartists/commit/db57d8b0239bd7970aa2c1...

Port to 2.78 - 0.8.0 changes - Toolbar - made layout recognizeable by saving startup file.
    https://github.com/Bforartists/Bforartists/commit/094f32f27e07b170ddc75d...
    
Port to 2.78 - 0.8.0 changes Toolbar implementation part 2
    https://github.com/Bforartists/Bforartists/commit/029eab273d8de2694fb7cf...

Port to 2.78 - 0.8.0 changes - Adding new toolbar editor part 1
    https://github.com/Bforartists/Bforartists/commit/86cf1837001ba6d5f24dfb...

Reiner's picture

Also through here. Means the port is more or less done. There are a few issues left though. Like some persistent bugs like the Toolbar editor not recognized in layouts here, the port of the addons etc.

Reiner's picture

Status: Active » Fixed
JulianEisel's picture

It seems like you're manually applying commits from Bforartists on the Blender source. Git offers tools to automate this process as far as possible, e.g. see 'git rebase'. Conflicts can be resolved with 'git mergetool' then.

Reiner's picture

Hi Julian,

That's exactly what i did. I merged Blender 2.78 into Bforartist across Git. But after the git merge quite a few things didn't work anymore. And that's what you see here. I went through all Bforartists commits now again, and reapplied the not working ones.

Most of it is of course my fault. It was my first merge. And i clicked a bit too often at "use their code". But i am through now. And the next merge will hopefully be easier Smile

Thanks for your input Smile

Reiner's picture

Status: Fixed » Closed (fixed)
JulianEisel's picture

Yes, you should always be super careful when resolving merge conflicts, it's often hard to find issues caused by them.

When maintaining a repository of the size of Bforarists on top of Blender, it's best to merge branches/repos regularly (as in, every few days), to keep merge conflicts as small as possible. I'd advise you to have a branch into which you merge both, the Bforartists master and Blender master branch (or release branch if available) regularly. When it's time to update Bforartists to Blender's latest changes/release, you just have to merge this branch back into the Bforarists master branch, which shouldn't throw any merge conflicts.

Reiner's picture

Nice idea! Will have a look to setup such a branch Smile