[tuhopuu-devel] State of the merge

[Chris Want]

Merge is done ... about 250 conflicts this time.
I think I might try doing more frequent merges
to see if this reduces the overall number of
conflicts.

Here is a list of code locations that may cause
trouble as the changes in tuhopuu were different
from the changes in tuhopuu and I didn't have a
good sense as to which change was "right". There may
be other problem areas so be sure to test your
projects well...

Kester:

* extern/solid/src/DT_Object.cpp:
   "return closest_pointsComplexConvex..." vs.
   "return -closest_pointsComplexConvex..."

* intern/SoundSystem/intern/SND_Scene.cpp:
   if ((playstate == SND_STOPPED && ...

* source/blender/src/space.c
   start_game(): SaveState/sound_init_audio/StartKetsjiShell stuff

* source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
   load_game_data(): return load_game_data(filename, NULL);

* source/gameengine/Ketsji/KX_PythonInit.cpp
   gPySetBackgroundColor(): gp_Rasterizer->SetBackColor() one arg or 4?
   gPySetMistColor():       gp_Rasterizer->SetFogColor()  one arg or 4?

* source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
   SM_Scene::~SM_Scene() lines commented out in bf

Bjornmose, Blendix:

* source/blender/src/buttons_editing.c
   do_uvautocalculationbuts()
   editing_panel_mesh_uvautocalculation()

* source/blender/src/drawmesh.c
   draw_tfaces3D() (/* shadow view */ stuff)

* source/blender/src/editmesh.c
   BIF_GetThemeColor3ubv(TH_VERTEX, col); vs BIF_ThemeColor(TH_VERTEX);