Blender Git Loki
Git Commits -> Revision 9822428
March 4, 2014, 21:43 (GMT) |
Merge branch 'master' into soc-2013-viewport_fx Conflicts: CMakeLists.txt intern/cycles/app/CMakeLists.txt intern/ghost/CMakeLists.txt intern/ghost/intern/GHOST_Window.h intern/ghost/intern/GHOST_WindowWin32.cpp intern/ghost/intern/GHOST_WindowWin32.h release/datafiles/startup.blend source/blender/blenfont/BLF_api.h source/blender/blenfont/intern/blf_font.c source/blender/blenfont/intern/blf_glyph.c source/blender/blenfont/intern/blf_lang.c source/blender/blenkernel/intern/anim.c source/blender/blenkernel/intern/cdderivedmesh.c source/blender/blenkernel/intern/displist.c source/blender/blenkernel/intern/editderivedmesh.c source/blender/blenkernel/intern/mball.c source/blender/blenkernel/intern/mesh.c source/blender/blenkernel/intern/pbvh.c source/blender/blenkernel/intern/subsurf_ccg.c source/blender/blenlib/BLI_math_base.h source/blender/blenlib/BLI_math_matrix.h source/blender/blenlib/BLI_smallhash.h source/blender/blenlib/intern/math_matrix.c source/blender/blenlib/intern/math_vector_inline.c source/blender/blenlib/intern/storage.c source/blender/blenloader/BLO_readfile.h source/blender/datatoc/CMakeLists.txt source/blender/editors/animation/keyframes_draw.c source/blender/editors/armature/CMakeLists.txt source/blender/editors/armature/editarmature_sketch.c source/blender/editors/gpencil/drawgpencil.c source/blender/editors/include/BIF_gl.h source/blender/editors/include/BIF_glutil.h source/blender/editors/include/UI_interface.h source/blender/editors/interface/interface_draw.c source/blender/editors/interface/interface_ops.c source/blender/editors/interface/interface_panel.c source/blender/editors/interface/interface_widgets.c source/blender/editors/mask/mask_draw.c source/blender/editors/mesh/editmesh_knife.c source/blender/editors/mesh/editmesh_select.c source/blender/editors/screen/glutil.c source/blender/editors/screen/screen_edit.c source/blender/editors/screen/screendump.c source/blender/editors/sculpt_paint/paint_cursor.c source/blender/editors/sculpt_paint/paint_image.c source/blender/editors/sculpt_paint/paint_image_proj.c source/blender/editors/sculpt_paint/paint_intern.h source/blender/editors/sculpt_paint/sculpt_intern.h source/blender/editors/space_action/action_draw.c source/blender/editors/space_action/space_action.c source/blender/editors/space_clip/clip_dopesheet_draw.c source/blender/editors/space_clip/clip_draw.c source/blender/editors/space_file/file_intern.h source/blender/editors/space_graph/graph_draw.c source/blender/editors/space_image/image_draw.c source/blender/editors/space_info/textview.c source/blender/editors/space_nla/nla_draw.c source/blender/editors/space_node/drawnode.c source/blender/editors/space_node/node_draw.c source/blender/editors/space_outliner/outliner_draw.c source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_text/text_draw.c source/blender/editors/space_view3d/drawarmature.c source/blender/editors/space_view3d/drawmesh.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/space_view3d/drawvolume.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/space_view3d/view3d_edit.c source/blender/editors/space_view3d/view3d_fly.c source/blender/editors/space_view3d/view3d_intern.h source/blender/editors/transform/transform.c source/blender/editors/transform/transform.h source/blender/editors/transform/transform_constraints.c source/blender/editors/transform/transform_manipulator.c source/blender/editors/util/ed_util.c source/blender/editors/uvedit/CMakeLists.txt source/blender/editors/uvedit/uvedit_draw.c source/blender/editors/uvedit/uvedit_smart_stitch.c source/blender/gpu/GPU_buffers.h source/blender/gpu/intern/gpu_buffers.c source/blender/gpu/intern/gpu_codegen.c source/blender/gpu/intern/gpu_draw.c source/blender/gpu/intern/gpu_extensions.c source/blender/gpu/intern/gpu_simple_shader.c source/blender/gpu/shaders/gpu_shader_material.glsl source/blender/render/intern/source/voxeldata.c source/blender/windowmanager/intern/wm_dragdrop.c source/blender/windowmanager/intern/wm_draw.c source/blender/windowmanager/intern/wm_event_system.c source/blender/windowmanager/intern/wm_gesture.c source/blender/windowmanager/intern/wm_subwindow.c source/blender/windowmanager/intern/wm_window.c |
Commit Details:
Full Hash: 9822428f6c2e4e279241f856886d7df5fa2cd144
Parent Commits: 0f1cac0, 42946c3