Blender Git Commits

Blender Git "soc-2014-viewport" branch commits.

May 31, 2014, 04:08 (GMT)
fix: visual studio 2010 project built with cmake could not find libjpeg
May 30, 2014, 03:56 (GMT)
Fixed compile errors associated with merge from soc-2013-viewport_fx and MSVC2010

not tested
May 22, 2014, 00:02 (GMT)
Merge branch 'soc-2014-viewport' into soc-2013-viewport_fx

Conflicts:
intern/cycles/device/device_cuda.cpp
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_translation.c
source/blender/blenkernel/BKE_brush.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/math_matrix.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/include/ED_armature.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/area.c
source/blender/editors/screen/glutil.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_utils.c
source/blender/editors/sculpt_paint/sculpt_intern.h
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_clip/clip_dopesheet_draw.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_graph_draw.c
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_console/console_draw.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_graph/graph_draw.c
source/blender/editors/space_info/info_draw.c
source/blender/editors/space_info/textview.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawanimviz.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/view3d_draw.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/space_view3d/view3d_walk.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/util/ed_util.c
source/blender/editors/uvedit/uvedit_draw.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_codegen.h
source/blender/gpu/intern/gpu_draw.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_subwindow.c
source/blender/windowmanager/intern/wm_window.c
May 20, 2014, 05:08 (GMT)
fixed compile errors on MacOSX Clang 5.1 after previous merge
May 20, 2014, 04:50 (GMT)
error fix: missing definition of offsetof when compiling with clang 5.1 on MacOS 10 Mavericks
May 20, 2014, 03:52 (GMT)
warning fix: removed unused function f_to_char
May 20, 2014, 03:03 (GMT)
warning fix: typedef of incomplete struct type forces redefinition of the typedef later, which is illegal except in C++ 11
March 17, 2014, 16:48 (GMT)
more merge conflict resolution from 9822428f6c2e4e279241f856886d7df5fa2cd144
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
February 19, 2014, 01:52 (GMT)
stub version of refactored GHOST for OSX Cocoa CGL
February 17, 2014, 17:00 (GMT)
removed 'enabled' field from CLIPPING state (not needed, a shader either implements clipping or it doesn't)
February 17, 2014, 16:58 (GMT)
fileops.c: warning fix: int -> float conversion
February 15, 2014, 21:46 (GMT)
Fixing more warnings given by llvm gcc on OSX.
February 15, 2014, 19:36 (GMT)
Added GPU_clipping module which implements state for the common clipping state. Also added preliminary support for clipping in the basic aspect, but only for the compatibility profile (i.e. still need to implement GLSL clipping planes)
February 15, 2014, 19:20 (GMT)
added assert to check for negative light index, also some whitespace cleanup
February 15, 2014, 19:19 (GMT)
Jason Wilkins contributed this GPU_sprite.h
February 15, 2014, 16:51 (GMT)
OpenGL Desktop system (WITH_GL_SYSTEM_DESKTOP) set to be ON by default in CMakeLists.txt
February 14, 2014, 17:36 (GMT)
Fixes for errors building on XCode on Mac OSX Mavericks. (Has more to do with llvm gcc than the OS.)

Still have to refactor GHOST for OSX and move glClipPlane into GPU module.
February 14, 2014, 17:04 (GMT)
Fixed some build errors that occur on MSVC 2014 when compiling WITH_GL_PROFILE_COMPAT.

(There are other errors that occur also in XCode, but I've fixed them in a separate commit already.)
November 2, 2013, 00:09 (GMT)
Should not use formattedMsg unless call to FormatMessage succeeded.
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021