Hopefully a working merge with trunk (could be one error left in raytrace.c - will...
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 20 Apr 2009 00:19:16 +0000 (00:19 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 20 Apr 2009 00:19:16 +0000 (00:19 +0000)
commit8a0a557294b61f67cdfc36c2c4163b3a88f71689
treea20dbd83e05edcc9895ecbb50ee65c45c5f56f2f
parent41b2a2a530804db35c3a0fed2d881acf6f332c3d
parent9078ce5da209bcfd31c60b55118076359ce7244f
Hopefully a working merge with trunk (could be one error left in raytrace.c - will check afterwards)

Merging 18706 - 19804
24 files changed:
release/scripts/image_auto_layout.py
release/scripts/import_dxf.py
release/scripts/scripttemplate_gamelogic.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/effect.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/butspace.h
source/blender/makesdna/DNA_object_force.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/raytrace.c
source/blender/render/intern/source/renderdatabase.c
source/blender/src/buttons_object.c
source/blender/src/buttons_shading.c
source/gameengine/Ketsji/KX_Dome.cpp
source/gameengine/Ketsji/KX_Dome.h
source/gameengine/Ketsji/KX_PythonInitTypes.cpp
source/gameengine/Ketsji/KX_PythonInitTypes.h
source/gameengine/Physics/common/PHY_IController.cpp
source/gameengine/Physics/common/PHY_IController.h
source/gameengine/Physics/common/PHY_IGraphicController.cpp
source/gameengine/Physics/common/PHY_IGraphicController.h