Blender Git Commit Log

Git Commits -> Revision d076822

July 17, 2013, 07:54 (GMT)
Merged work from working copy of GSoC 2012 work into GSoC 2013 branch.

Compiles w/ Visual Studio 2012 but not thoroughly tested.
Still need double check for any merge "fuzz"

Commit Details:

Full Hash: d076822e66c37cecf3ef58b8a15136e5649ae459
SVN Revision: 58327
Parent Commit: b069eda
Lines Changed: +79038, -8423

58 Added Paths:

/extern/glew-es/CMakeLists.txt (+50, -0) (View)
/extern/glew-es/include/GL/eglew.h (+1369, -0) (View)
/extern/glew-es/include/GL/glesew.h (+4182, -0) (View)
/extern/glew-es/include/GL/glew.h (+20514, -0) (View)
/extern/glew-es/include/GL/glxew.h (+1649, -0) (View)
/extern/glew-es/include/GL/wglew.h (+1421, -0) (View)
/extern/glew-es/SConscript (+12, -0) (View)
/extern/glew-es/src/glew.c (+22241, -0) (View)
/intern/ghost/intern/GHOST_ContextAGL.cpp (+32, -0) (View)
/intern/ghost/intern/GHOST_ContextAGL.h (+37, -0) (View)
/intern/ghost/intern/GHOST_ContextCGL.h (+37, -0) (View)
/intern/ghost/intern/GHOST_ContextCGL.mm (+32, -0) (View)
/intern/ghost/intern/GHOST_ContextEGL.cpp (+32, -0) (View)
/intern/ghost/intern/GHOST_ContextEGL.h (+37, -0) (View)
/intern/ghost/intern/GHOST_ContextWGL.cpp (+32, -0) (View)
/intern/ghost/intern/GHOST_ContextWGL.h (+37, -0) (View)
/intern/ghost/intern/GHOST_ContextXGL.cpp (+32, -0) (View)
/intern/ghost/intern/GHOST_ContextXGL.h (+37, -0) (View)
/source/blender/editors/armature/editarmature.c (+6199, -0) (View)
/source/blender/editors/mesh/editmesh_slide.c (+796, -0) (View)
/source/blender/gpu/GPU_colors.h (+41, -0) (View)
/source/blender/gpu/GPU_compatibility.h (+55, -0) (View)
/source/blender/gpu/GPU_functions.h (+294, -0) (View)
/source/blender/gpu/GPU_matrix.h (+105, -0) (View)
/source/blender/gpu/GPU_object.h (+28, -0) (View)
/source/blender/gpu/GPU_primitives.h (+243, -0) (View)
/source/blender/gpu/GPU_utility.h (+68, -0) (View)
/source/blender/gpu/intern/gpu_debug.c (+401, -0) (View)
/source/blender/gpu/intern/gpu_deprecated.h (+549, -0) (View)
/source/blender/gpu/intern/gpu_functions.c (+301, -0) (View)
/source/blender/gpu/intern/gpu_glew.h (+41, -0) (View)
/source/blender/gpu/intern/gpu_immediate.c (+1728, -0) (View)
/source/blender/gpu/intern/gpu_immediate.h (+519, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl11.c (+452, -0) (View)
/source/blender/gpu/intern/gpu_immediate_glsl.c (+546, -0) (View)
/source/blender/gpu/intern/gpu_immediate_inline.h (+570, -0) (View)
/source/blender/gpu/intern/gpu_immediate_internal.h (+230, -0) (View)
/source/blender/gpu/intern/gpu_immediate_vbo.c (+69, -0) (View)
/source/blender/gpu/intern/gpu_lighting.c (+93, -0) (View)
/source/blender/gpu/intern/gpu_lighting.h (+86, -0) (View)
/source/blender/gpu/intern/gpu_lighting_gl11.c (+145, -0) (View)
/source/blender/gpu/intern/gpu_lighting_glsl.c (+130, -0) (View)
/source/blender/gpu/intern/gpu_lighting_inline.h (+149, -0) (View)
/source/blender/gpu/intern/gpu_lighting_internal.h (+88, -0) (View)
/source/blender/gpu/intern/gpu_matrix.c (+577, -0) (View)
/source/blender/gpu/intern/gpu_object.c (+42, -0) (View)
/source/blender/gpu/intern/gpu_object_gl11.c (+103, -0) (View)
/source/blender/gpu/intern/gpu_object_gl11.h (+11, -0) (View)
/source/blender/gpu/intern/gpu_object_gles.c (+289, -0) (View)
/source/blender/gpu/intern/gpu_object_gles.h (+51, -0) (View)
/source/blender/gpu/intern/gpu_primitives.c (+1476, -0) (View)
/source/blender/gpu/intern/gpu_primitives_inline.h (+244, -0) (View)
/source/blender/gpu/intern/gpu_safety.h (+71, -0) (View)
/source/blender/gpu/intern/gpu_view.c (+51, -0) (View)
/source/blender/gpu/intern/gpu_view.h (+64, -0) (View)
/source/blender/gpu/intern/gpu_view_gl.c (+96, -0) (View)
/source/blender/gpu/intern/gpu_view_gl.h (+47, -0) (View)
/source/creator/buildinfo.h.rule (+1, -0) (View)

1 Deleted Path:

/source/blender/editors/include/BIF_gl.h (+0, -64)

205 Modified Paths:

/build_files/cmake/macros.cmake (+6, -5) (Diff)
/CMakeLists.txt (+153, -7) (Diff)
/extern/CMakeLists.txt (+5, -1) (Diff)
/extern/glew/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/app/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/device/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/device/device.cpp (+4, -2) (Diff)
/intern/cycles/device/device_cuda.cpp (+7, -5) (Diff)
/intern/cycles/util/CMakeLists.txt (+5, -1) (Diff)
/intern/ghost/CMakeLists.txt (+164, -110) (Diff)
/intern/ghost/intern/GHOST_SystemX11.h (+0, -1) (Diff)
/intern/ghost/intern/GHOST_WindowX11.cpp (+110, -18) (Diff)
/intern/ghost/intern/GHOST_WindowX11.h (+19, -1) (Diff)
/source/blender/blenfont/BLF_api.h (+7, -0) (Diff)
/source/blender/blenfont/CMakeLists.txt (+2, -1) (Diff)
/source/blender/blenfont/intern/blf.c (+130, -74) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+0, -2) (Diff)
/source/blender/blenfont/intern/blf_font.c (+23, -4) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+76, -57) (Diff)
/source/blender/blenfont/intern/blf_internal.h (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+4, -0) (Diff)
/source/blender/blenfont/intern/blf_translation.c (+3, -3) (Diff)
/source/blender/blenfont/SConscript (+1, -0) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+6, -3) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+1, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/bpath.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+292, -135) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+14, -15) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+309, -218) (Diff)
/source/blender/blenkernel/intern/freestyle.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/group.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/linestyle.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/smoke.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+282, -186) (Diff)
/source/blender/blenlib/BLI_fileops.h (+11, -12) (Diff)
/source/blender/blenlib/BLI_fileops_types.h (+19, -9) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+26, -11) (Diff)
/source/blender/blenlib/BLI_smallhash.h (+4, -0) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+10, -0) (Diff)
/source/blender/blenlib/BLI_winstuff.h (+0, -4) (Diff)
/source/blender/blenlib/intern/fileops.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+220, -31) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+13, -0) (Diff)
/source/blender/blenlib/intern/storage.c (+3, -3) (Diff)
/source/blender/blenloader/BLO_readfile.h (+3, -1) (Diff)
/source/blender/blenloader/intern/runtime.c (+1, -1) (Diff)
/source/blender/datatoc/CMakeLists.txt (+4, -0) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+23, -26) (Diff)
/source/blender/editors/animation/anim_draw.c (+27, -19) (Diff)
/source/blender/editors/animation/anim_markers.c (+19, -20) (Diff)
/source/blender/editors/animation/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+27, -48) (Diff)
/source/blender/editors/armature/armature_naming.c (+1, -0) (Diff)
/source/blender/editors/armature/armature_relations.c (+2, -0) (Diff)
/source/blender/editors/armature/armature_select.c (+2, -2) (Diff)
/source/blender/editors/armature/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+67, -61) (Diff)
/source/blender/editors/armature/pose_lib.c (+1, -0) (Diff)
/source/blender/editors/armature/reeb.c (+43, -37) (Diff)
/source/blender/editors/gpencil/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+81, -80) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+7, -11) (Diff)
/source/blender/editors/include/BIF_glutil.h (+6, -41) (Diff)
/source/blender/editors/include/ED_node.h (+0, -1) (Diff)
/source/blender/editors/include/ED_view3d.h (+0, -2) (Diff)
/source/blender/editors/include/UI_resources.h (+5, -0) (Diff)
/source/blender/editors/interface/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/interface/interface.c (+13, -15) (Diff)
/source/blender/editors/interface/interface_draw.c (+554, -481) (Diff)
/source/blender/editors/interface/interface_icons.c (+134, -102) (Diff)
/source/blender/editors/interface/interface_ops.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_panel.c (+71, -36) (Diff)
/source/blender/editors/interface/interface_regions.c (+6, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+235, -206) (Diff)
/source/blender/editors/interface/resources.c (+102, -16) (Diff)
/source/blender/editors/interface/view2d.c (+100, -96) (Diff)
/source/blender/editors/mask/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/mask/mask_draw.c (+71, -65) (Diff)
/source/blender/editors/mesh/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/mesh/editface.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+57, -52) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+13, -9) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+18, -17) (Diff)
/source/blender/editors/object/CMakeLists.txt (+3, -1) (Diff)
/source/blender/editors/physics/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/physics/particle_edit.c (+9, -13) (Diff)
/source/blender/editors/render/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/render/render_internal.c (+4, -3) (Diff)
/source/blender/editors/render/render_opengl.c (+1, -3) (Diff)
/source/blender/editors/render/render_preview.c (+2, -1) (Diff)
/source/blender/editors/screen/area.c (+123, -106) (Diff)
/source/blender/editors/screen/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/screen/glutil.c (+121, -324) (Diff)
/source/blender/editors/screen/screendump.c (+6, -5) (Diff)
/source/blender/editors/screen/screen_edit.c (+61, -44) (Diff)
/source/blender/editors/sculpt_paint/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+56, -53) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+11, -9) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+11, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_utils.c (+7, -4) (Diff)
/source/blender/editors/space_action/action_draw.c (+43, -30) (Diff)
/source/blender/editors/space_action/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_action/space_action.c (+3, -3) (Diff)
/source/blender/editors/space_buttons/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+32, -47) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+221, -192) (Diff)
/source/blender/editors/space_clip/clip_editor.c (+1, -0) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+17, -32) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+20, -18) (Diff)
/source/blender/editors/space_clip/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -5) (Diff)
/source/blender/editors/space_console/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_console/console_draw.c (+4, -4) (Diff)
/source/blender/editors/space_console/space_console.c (+2, -2) (Diff)
/source/blender/editors/space_file/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_file/file_draw.c (+19, -13) (Diff)
/source/blender/editors/space_file/space_file.c (+3, -5) (Diff)
/source/blender/editors/space_graph/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+102, -128) (Diff)
/source/blender/editors/space_graph/space_graph.c (+14, -18) (Diff)
/source/blender/editors/space_image/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_image/image_draw.c (+78, -65) (Diff)
/source/blender/editors/space_image/space_image.c (+2, -3) (Diff)
/source/blender/editors/space_info/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_info/info_draw.c (+2, -3) (Diff)
/source/blender/editors/space_info/space_info.c (+2, -2) (Diff)
/source/blender/editors/space_info/textview.c (+15, -15) (Diff)
/source/blender/editors/space_logic/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_logic/logic_window.c (+2, -1) (Diff)
/source/blender/editors/space_logic/space_logic.c (+2, -3) (Diff)
/source/blender/editors/space_nla/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+106, -92) (Diff)
/source/blender/editors/space_nla/space_nla.c (+3, -3) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+2, -0) (Diff)
/source/blender/editors/space_node/drawnode.c (+105, -120) (Diff)
/source/blender/editors/space_node/node_draw.c (+50, -39) (Diff)
/source/blender/editors/space_outliner/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+68, -43) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+2, -2) (Diff)
/source/blender/editors/space_script/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_script/space_script.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+169, -155) (Diff)
/source/blender/editors/space_text/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_text/space_text.c (+2, -2) (Diff)
/source/blender/editors/space_text/text_draw.c (+190, -57) (Diff)
/source/blender/editors/space_time/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/space_time/space_time.c (+46, -36) (Diff)
/source/blender/editors/space_view3d/CMakeLists.txt (+3, -2) (Diff)
/source/blender/editors/space_view3d/drawanimviz.c (+61, -56) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+504, -512) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+132, -86) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1527, -1375) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+27, -21) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+4, -3) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+330, -282) (Diff)
/source/blender/editors/space_view3d/view3d_edit.c (+30, -47) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+29, -20) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+0, -2) (Diff)
/source/blender/editors/space_view3d/view3d_project.c (+7, -7) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+71, -46) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+5, -3) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+20, -14) (Diff)
/source/blender/editors/transform/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/transform/transform.c (+441, -159) (Diff)
/source/blender/editors/transform/transform.h (+1, -4) (Diff)
/source/blender/editors/transform/transform_constraints.c (+19, -73) (Diff)
/source/blender/editors/transform/transform_generics.c (+0, -41) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+381, -412) (Diff)
/source/blender/editors/transform/transform_snap.c (+1, -129) (Diff)
/source/blender/editors/util/CMakeLists.txt (+2, -2) (Diff)
/source/blender/editors/util/ed_util.c (+8, -5) (Diff)
/source/blender/editors/uvedit/CMakeLists.txt (+3, -0) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+118, -107) (Diff)
/source/blender/editors/uvedit/uvedit_smart_stitch.c (+2, -2) (Diff)
/source/blender/gpu/CMakeLists.txt (+39, -2) (Diff)
/source/blender/gpu/GPU_extensions.h (+33, -1) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+44, -31) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+36, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+3, -2) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+366, -513) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+138, -112) (Diff)
/source/blender/gpu/intern/gpu_material.c (+22, -6) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+20, -2) (Diff)
/source/blender/imbuf/intern/thumbs.c (+1, -1) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+3, -3) (Diff)
/source/blender/python/generic/CMakeLists.txt (+1, -1) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+3, -1) (Diff)
/source/blender/windowmanager/intern/wm_dragdrop.c (+9, -8) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+27, -16) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+3, -8) (Diff)
/source/blender/windowmanager/intern/wm_gesture.c (+101, -67) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+32, -2) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+50, -32) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+4, -2) (Diff)
/source/blender/windowmanager/intern/wm_subwindow.c (+62, -40) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+3, -3) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+3, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021