[tuhopuu-devel] State of the merge

[Chris Want]

Many conflicts ... hopefully things still compile ....
here's the damage:

As requested by Brecht, I went with tuhopuu on all uv
type commits, but still should be tested for correctness.

readfile.c: conflict related to camera's and passepartout
... anybody know about this? (just went with bf)

butspace.h: I changed the values of B_PRESET_RDIMENSIONS, etc so
they did not conflict with the values for the zblur stuff.

buttons_editing.c: camera edit buttons caused conflict, Matt,
please check. (I sort of smushed together the code from both
trees, mostly tuhopuu).

buttons_object.c: soft body panel should be checked for correctness
(whereever the buttons "D", "I", "O" are).

buttons_scene.c: the render window buttons should be checked for
correctness ... panel with passepartout, DispWin, etc.
function render_panels() should be checked (I just smushed the
code for the two trees together).

drawobject.c: drawing of lamps should be checked ... went with
tuhopuu code.

space.c: change in hotkey modifiers for V3D_MANIP_TRANSLATE/ROTATE/SCALE
(what ever that is) ... went with ctrl-alt a la bf-blender...
there is something about 'repeat_menu()' that should be checked,
for RKEY in editmode.

transform_manipulator.c: colors, etc. for some things ... went with
tuhopuu. This should be *seriously* checked (many little surgeries
here). draw_manipulator_translate() was particularly bad.