Add menu problems in the sync_blender_master branch

Reiner's picture
Project: 
Bforartists Tracker

We have the sync_blender_master branch where we merge the newest changes from blender into Bforartists. So that we can keep the Bforartists master in a working stage. And to merge this changes at a later point into the Master when the next Blender version is ready.

Usually you get errors when something doesn't fit. The merge conflicts. But sometimes this merge makes nonsense without you notice it. And then later you stumble across it.

Currently we have a problem with the add menu ...

Status: 
Closed (fixed)
Priority: 
Normal
Category: 
Task
Component: 
User interface
Assigned: 
Images: 
Reporter: 
Created: 
Sat, 08/12/2017 - 12:50
Updated: 
Sun, 08/13/2017 - 09:48

Comments

7
Reiner's picture

Body: Old » New
Reiner's picture

Assigned: Unassigned » Reiner
Reiner's picture

The issue at the end is a missing icon. Blender devs have added a new one it seems. EDIT says, two new ones ...

DEF_ICON(OUTLINER_OB_FORCE_FIELD)
DEF_ICON(OUTLINER_OB_GROUP_INSTANCE)

.... and introduced force fields and group instances as double menu entries again -.-

This taks is something bigger I-m so happy

Reiner's picture

Missing Icons fixed in sync blender master branch

https://github.com/Bforartists/Bforartists/commit/9c71d46fbc8008db272e61...

And as told, followup is to remove the double menu entries here now when possible.

Image: 
Reiner's picture

One more, the new group instance icon is of course also needed in our already implemented menu item.

Image: 
Reiner's picture
Reiner's picture

Status: Active » Closed (fixed)