Blender Git Loki
Git Commits -> Revision 5d3b635
May 30, 2014, 03:56 (GMT) |
Fixed compile errors associated with merge from soc-2013-viewport_fx and MSVC2010 not tested |
Commit Details:
Full Hash: 5d3b635d310d39ca1e8fba85de313623c8d0c238
Parent Commit: 6eff1cb
Lines Changed: +335, -328
31 Modified Paths:
/source/blender/blenfont/intern/blf.c (+2, -2) (Diff)
/source/blender/blenfont/intern/blf_font.c (+3, -3) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+4, -4) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+81, -82) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+75, -72) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+35, -35) (Diff)
/source/blender/blenlib/BLI_bitmap.h (+2, -0) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+9, -14) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+2, -2) (Diff)
/source/blender/editors/include/ED_keyframing.h (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+2, -1) (Diff)
/source/blender/editors/interface/interface_draw.c (+52, -60) (Diff)
/source/blender/editors/interface/interface_panel.c (+2, -2) (Diff)
/source/blender/editors/mask/mask_draw.c (+2, -2) (Diff)
/source/blender/editors/screen/area.c (+5, -5) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+7, -0) (Diff)
/source/blender/editors/sculpt_paint/sculpt_uv.c (+9, -10) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_window.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+2, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+4, -4) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+4, -4) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+6, -8) (Diff)
/source/blender/gpu/GPU_deprecated.h (+4, -0) (Diff)
/source/blender/gpu/GPU_extensions.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+11, -6) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_pixels.c (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_font.c (+3, -3) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+4, -4) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+81, -82) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+75, -72) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+35, -35) (Diff)
/source/blender/blenlib/BLI_bitmap.h (+2, -0) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+9, -14) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+2, -2) (Diff)
/source/blender/editors/include/ED_keyframing.h (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+2, -1) (Diff)
/source/blender/editors/interface/interface_draw.c (+52, -60) (Diff)
/source/blender/editors/interface/interface_panel.c (+2, -2) (Diff)
/source/blender/editors/mask/mask_draw.c (+2, -2) (Diff)
/source/blender/editors/screen/area.c (+5, -5) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+7, -0) (Diff)
/source/blender/editors/sculpt_paint/sculpt_uv.c (+9, -10) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_window.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+2, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+4, -4) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+4, -4) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -1) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+6, -8) (Diff)
/source/blender/gpu/GPU_deprecated.h (+4, -0) (Diff)
/source/blender/gpu/GPU_extensions.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+11, -6) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_pixels.c (+1, -1) (Diff)