Port to 2.78 - Meld Cleanup

Reiner's picture
Bforartists Tracker

The merge has left quite a few code parts untouched, and has produced at least one bug See here: http://www.bforartists.de/content/toolbar-crash-desktop-edit-mode-when-s...

This bug was not to catch at the normal way yet. So we need to go through the differences between Blender and Bforartists again, using Meld.

We will do this folderwise. Everything at once is too much.

Closed (fixed)
User interface
Sat, 02/11/2017 - 10:14
Mon, 02/20/2017 - 18:35


Reiner's picture

Port to 2.78 - Meld cleanup in release/scripts/startup/nodeitems_builtins.py
    Issue: http://www.bforartists.de/content/port-278-meld-cleanup

Port to 2.78 - Meld cleanup in intern/opensubdiv/opensubdiv_gpu_capi.cc

Meld cleanup in source/blender/editors/space_view3d
Port to 2.78 - Meld Cleanup in source/blender/editors/animation/anim_draw.c
Port to 2.78 - Meld cleanup, added comment in source/blender/editors/armature/armature_edit.c
Port to 2.78 - Meld cleanup in source/blender/editors/gpencil
Port to 2.78 - Meld cleanup in source/blender/editors/mesh/editmesh_add.c
Port to 2.78 - Meld cleanup - fixed wrong tooltips in source/blender/editors/physics/rigidbody_constraint.c
Port to 2.78 - Meld cleanup in source/blender/editors/space_node/node_group.c
Port to 2.78 - Meld cleanup in source/blender/editors/transform/transform_generics.c
Port to 2.78 - Meld cleanup in source/blender/alembic/intern/abc_object.cc
Port to 2.78 - Meld cleanup in source/blender/blenkernel/intern/customdata.c
Port to 2.78 - Meld cleanup in source/blender/blenkernel/intern/mesh.c
Port to 2.78 - Meld cleanup in source/blender/imbuf/intern/openexr/openexr_api.cpp
Port to 2.78 - Meld cleanup in intern/cycles/blender

Reiner's picture

Through with the single files. Was not as much as thought.

The task is not fully finished though. There are whole folders in Bforartists that not longer exists in Blender. Like the whole scons stuff. And some stuff vice versa. We had never the tools onboard.

But first let's catch the crash bug. It can happen that i have to start from scratch ...


Reiner's picture

Status: Active » Needs work
Reiner's picture

No need to redo from scratch. The crashbug is not gone, but nailed. The feature is temporary disabled until a solution is found. And the melding is finished. Closing.

Reiner's picture

Status: Needs work » Closed (fixed)