Blender Git Commit Log

Git Commits -> Revision 0b778a9

Revision 0b778a9 by Sergey Sharybin (master)
September 6, 2012, 09:44 (GMT)
Merging r50423 through r50449 from trunk into soc-2011-tomato

Commit Details:

Full Hash: 0b778a902691b4421067f7826bb6e0b6a4d8cec5
SVN Revision: 50450
Parent Commit: bac6f03
Lines Changed: +1910, -1540

1 Added Path:

/intern/cycles/kernel/osl/bsdf_phong.cpp (+277, -0) (View)

135 Modified Paths:

/intern/audaspace/intern/AUD_ReferenceHandler.cpp (+1, -1) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_triangle.h (+31, -9) (Diff)
/intern/cycles/kernel/kernel_types.h (+26, -0) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+2, -0) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+6, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+3, -3) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+4, -4) (Diff)
/intern/cycles/render/attribute.cpp (+1, -25) (Diff)
/intern/cycles/render/attribute.h (+0, -1) (Diff)
/intern/cycles/render/mesh.cpp (+1, -1) (Diff)
/intern/ghost/GHOST_IEvent.h (+8, -8) (Diff)
/intern/ghost/GHOST_IEventConsumer.h (+6, -6) (Diff)
/intern/ghost/GHOST_ISystem.h (+67, -66) (Diff)
/intern/ghost/GHOST_ISystemPaths.h (+6, -6) (Diff)
/intern/ghost/GHOST_ITimerTask.h (+8, -8) (Diff)
/intern/ghost/GHOST_IWindow.h (+52, -52) (Diff)
/intern/ghost/GHOST_Path-api.h (+5, -5) (Diff)
/intern/ghost/GHOST_Rect.h (+34, -34) (Diff)
/intern/ghost/GHOST_Types.h (+2, -2) (Diff)
/intern/ghost/intern/GHOST_Buttons.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_CallbackEventConsumer.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_DisplayManager.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_DisplayManager.h (+23, -23) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerCarbon.h (+21, -21) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerCocoa.h (+18, -18) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm (+2, -2) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerWin32.h (+17, -17) (Diff)
/intern/ghost/intern/GHOST_DisplayManagerX11.h (+17, -17) (Diff)
/intern/ghost/intern/GHOST_DropTargetWin32.h (+15, -15) (Diff)
/intern/ghost/intern/GHOST_DropTargetX11.h (+14, -14) (Diff)
/intern/ghost/intern/GHOST_Event.h (+9, -9) (Diff)
/intern/ghost/intern/GHOST_EventButton.h (+7, -7) (Diff)
/intern/ghost/intern/GHOST_EventCursor.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_EventDragnDrop.h (+7, -7) (Diff)
/intern/ghost/intern/GHOST_EventKey.h (+9, -9) (Diff)
/intern/ghost/intern/GHOST_EventManager.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_EventManager.h (+16, -16) (Diff)
/intern/ghost/intern/GHOST_EventPrinter.h (+4, -4) (Diff)
/intern/ghost/intern/GHOST_EventString.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_EventTrackpad.h (+5, -5) (Diff)
/intern/ghost/intern/GHOST_EventWheel.h (+5, -5) (Diff)
/intern/ghost/intern/GHOST_ISystem.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_ISystemPaths.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_ModifierKeys.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_ModifierKeys.h (+10, -10) (Diff)
/intern/ghost/intern/GHOST_System.h (+52, -52) (Diff)
/intern/ghost/intern/GHOST_SystemCarbon.cpp (+3, -3) (Diff)
/intern/ghost/intern/GHOST_SystemCarbon.h (+47, -47) (Diff)
/intern/ghost/intern/GHOST_SystemCocoa.h (+52, -52) (Diff)
/intern/ghost/intern/GHOST_SystemCocoa.mm (+37, -40) (Diff)
/intern/ghost/intern/GHOST_SystemPaths.h (+3, -3) (Diff)
/intern/ghost/intern/GHOST_SystemPathsCarbon.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_SystemPathsCocoa.h (+3, -3) (Diff)
/intern/ghost/intern/GHOST_SystemPathsWin32.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_SystemPathsX11.h (+3, -3) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.h (+82, -81) (Diff)
/intern/ghost/intern/GHOST_SystemX11.cpp (+12, -12) (Diff)
/intern/ghost/intern/GHOST_SystemX11.h (+37, -37) (Diff)
/intern/ghost/intern/GHOST_TimerManager.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_TimerManager.h (+14, -14) (Diff)
/intern/ghost/intern/GHOST_TimerTask.h (+18, -18) (Diff)
/intern/ghost/intern/GHOST_Window.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_Window.h (+36, -36) (Diff)
/intern/ghost/intern/GHOST_WindowCarbon.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_WindowCarbon.h (+44, -44) (Diff)
/intern/ghost/intern/GHOST_WindowCocoa.h (+54, -54) (Diff)
/intern/ghost/intern/GHOST_WindowCocoa.mm (+127, -136) (Diff)
/intern/ghost/intern/GHOST_WindowManager.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_WindowManager.h (+20, -20) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+2, -2) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.h (+46, -46) (Diff)
/intern/ghost/intern/GHOST_WindowX11.cpp (+3, -3) (Diff)
/intern/ghost/intern/GHOST_WindowX11.h (+17, -17) (Diff)
/intern/ghost/test/gears/GHOST_C-Test.c (+2, -2) (Diff)
/intern/ghost/test/gears/GHOST_Test.cpp (+2, -2) (Diff)
/source/blender/blenfont/intern/blf_lang.c (+2, -1) (Diff)
/source/blender/blenkernel/BKE_customdata.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_mask.h (+0, -3) (Diff)
/source/blender/blenkernel/BKE_object_deform.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_script.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_shrinkwrap.h (+3, -3) (Diff)
/source/blender/blenkernel/intern/library.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/mball.c (+18, -15) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+29, -12) (Diff)
/source/blender/blenkernel/intern/shrinkwrap.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/writeffmpeg.c (+13, -5) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+1, -0) (Diff)
/source/blender/blenlib/BLI_path_util.h (+0, -1) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+7, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -11) (Diff)
/source/blender/bmesh/bmesh.h (+5, -0) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+28, -19) (Diff)
/source/blender/bmesh/operators/bmo_connect.c (+26, -32) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+89, -51) (Diff)
/source/blender/compositor/COM_compositor.h (+4, -1) (Diff)
/source/blender/compositor/intern/COM_Converter.cpp (+4, -2) (Diff)
/source/blender/compositor/intern/COM_ExecutionSystemHelper.h (+1, -1) (Diff)
/source/blender/compositor/operations/COM_RenderLayersImageProg.h (+1, -1) (Diff)
/source/blender/editors/animation/anim_filter.c (+2, -2) (Diff)
/source/blender/editors/armature/reeb.c (+1, -1) (Diff)
/source/blender/editors/armature/reeb.h (+2, -2) (Diff)
/source/blender/editors/curve/editcurve.c (+7, -7) (Diff)
/source/blender/editors/include/ED_mesh.h (+0, -3) (Diff)
/source/blender/editors/include/ED_render.h (+1, -7) (Diff)
/source/blender/editors/io/io_collada.h (+1, -1) (Diff)
/source/blender/editors/io/io_ops.h (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_slide.c (+47, -7) (Diff)
/source/blender/editors/screen/glutil.c (+3, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+3, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_intern.h (+0, -2) (Diff)
/source/blender/editors/uvedit/uvedit_intern.h (+0, -4) (Diff)
/source/blender/ikplugin/BIK_api.h (+3, -3) (Diff)
/source/blender/imbuf/intern/imbuf_cocoa.m (+1, -1) (Diff)
/source/blender/makesdna/DNA_meshdata_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+1, -4) (Diff)
/source/blender/makesdna/DNA_screen_types.h (+0, -9) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+0, -5) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+3, -1) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+2, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+1, -1) (Diff)
/source/blender/render/intern/include/render_types.h (+0, -1) (Diff)
/source/blender/render/intern/include/sunsky.h (+1, -3) (Diff)
/source/blender/render/intern/include/volumetric.h (+0, -3) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+58, -60) (Diff)
/source/gameengine/Expressions/PyObjectPlus.cpp (+2, -2) (Diff)
/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp (+5, -5) (Diff)
/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h (+3, -3) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+9, -10) (Diff)
/source/gameengine/Ketsji/KX_PythonMain.cpp (+1, -1) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021