Blender Git Loki
Git Commits -> Revision 2d428a4
Revision 2d428a4 by Campbell Barton (apricot) August 21, 2008, 23:41 (GMT) |
partial merge because of conflicts svn merge -16186:16194 https://svn.blender.org/svnroot/bf-blender/trunk/blender |
Commit Details:
Full Hash: 2d428a406112fc3b1c03540db679910236c526e8
SVN Revision: 16217
Parent Commit: 2febace
Lines Changed: +172, -22
10 Modified Paths:
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/include/BIF_resources.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+5, -0) (Diff)
/source/blender/src/drawipo.c (+42, -10) (Diff)
/source/blender/src/resources.c (+17, -2) (Diff)
/source/blender/src/space.c (+3, -0) (Diff)
/source/blender/src/usiblender.c (+9, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+43, -6) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.h (+30, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+18, -1) (Diff)
/source/blender/include/BIF_resources.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+5, -0) (Diff)
/source/blender/src/drawipo.c (+42, -10) (Diff)
/source/blender/src/resources.c (+17, -2) (Diff)
/source/blender/src/space.c (+3, -0) (Diff)
/source/blender/src/usiblender.c (+9, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+43, -6) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.h (+30, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+18, -1) (Diff)