manually copy more changes from trunk.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 09:02:39 +0000 (09:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 May 2011 09:02:39 +0000 (09:02 +0000)
commit33bfcb26b8997d68adbfbf5931e2157a6ba9fbce
treefb18a347b2426faa9d2a487363f1d048ddbd6807
parent191ad54599b2d8c8677f56870ee1800e62c50137
manually copy more changes from trunk.
20 files changed:
intern/ghost/intern/GHOST_SystemWin32.h
source/blender/blenkernel/intern/context.c
source/blender/editors/interface/resources.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_shader_material.glsl
source/blender/makesdna/DNA_color_types.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_key_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/SConscript
source/creator/CMakeLists.txt
source/creator/creator.c