Blender Git Commit Log

Git Commits -> Revision e15f352

Revision e15f352 by Sergey Sharybin (master)
September 4, 2012, 09:06 (GMT)
Merging r50265 through r50373 from trunk into soc-2011-tomato

Commit Details:

Full Hash: e15f352831b9cc9fa1a85a0cdadf6d4b4b1f8731
SVN Revision: 50376
Parent Commit: 86ff6cc
Lines Changed: +2898, -1598

11 Added Paths:

/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl (+29, -0) (View)
/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl (+30, -0) (View)
/intern/cycles/kernel/osl/nodes/oslutil.h (+91, -0) (View)
/intern/cycles/render/particles.cpp (+123, -0) (View)
/intern/cycles/render/particles.h (+74, -0) (View)
/source/blender/blenlib/BLI_endian_switch.h (+42, -0) (View)
/source/blender/blenlib/BLI_endian_switch_inline.h (+116, -0) (View)
/source/blender/blenlib/intern/endian_switch.c (+118, -0) (View)
/source/blender/blenloader/BLO_blend_defs.h (+47, -0) (View)
/source/gameengine/Ketsji/KX_PythonMain.cpp (+77, -0) (View)
/source/gameengine/Ketsji/KX_PythonMain.h (+41, -0) (View)

1 Deleted Path:

/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl (+0, -40)

231 Modified Paths:

/build_files/scons/config/win32-mingw-config.py (+1, -1) (Diff)
/build_files/scons/config/win64-mingw-config.py (+1, -1) (Diff)
/doc/python_api/sphinx_doc_gen.py (+1, -1) (Diff)
/intern/cycles/app/cycles_xml.cpp (+2, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+3, -0) (Diff)
/intern/cycles/blender/blender_object.cpp (+4, -9) (Diff)
/intern/cycles/blender/blender_particles.cpp (+91, -38) (Diff)
/intern/cycles/blender/blender_shader.cpp (+2, -0) (Diff)
/intern/cycles/blender/blender_sync.cpp (+9, -0) (Diff)
/intern/cycles/blender/blender_sync.h (+4, -2) (Diff)
/intern/cycles/blender/blender_util.h (+16, -0) (Diff)
/intern/cycles/cmake/external_libs.cmake (+1, -1) (Diff)
/intern/cycles/CMakeLists.txt (+2, -2) (Diff)
/intern/cycles/kernel/kernel_accumulate.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_object.h (+40, -3) (Diff)
/intern/cycles/kernel/kernel_path.h (+11, -6) (Diff)
/intern/cycles/kernel/kernel_shader.h (+99, -52) (Diff)
/intern/cycles/kernel/kernel_triangle.h (+2, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+2, -3) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+6, -3) (Diff)
/intern/cycles/kernel/osl/nodes/node_brightness.osl (+6, -5) (Diff)
/intern/cycles/kernel/osl/nodes/node_checker_texture.osl (+2, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_gamma.osl (+2, -8) (Diff)
/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl (+2, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl (+2, -2) (Diff)
/intern/cycles/kernel/osl/nodes/node_invert.osl (+1, -1) (Diff)
/intern/cycles/kernel/osl/nodes/node_math.osl (+4, -0) (Diff)
/intern/cycles/kernel/osl/nodes/node_mix.osl (+15, -0) (Diff)
/intern/cycles/kernel/osl/nodes/node_noise_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/osl/nodes/node_normal.osl (+3, -4) (Diff)
/intern/cycles/kernel/osl/nodes/node_texture.h (+24, -5) (Diff)
/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/osl/nodes/node_wave_texture.osl (+2, -2) (Diff)
/intern/cycles/kernel/osl/nodes/stdosl.h (+294, -236) (Diff)
/intern/cycles/kernel/osl/osl_globals.h (+4, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+18, -127) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+10, -29) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+35, -46) (Diff)
/intern/cycles/kernel/svm/svm_geometry.h (+30, -8) (Diff)
/intern/cycles/kernel/svm/svm_math.h (+2, -0) (Diff)
/intern/cycles/kernel/svm/svm_mix.h (+12, -0) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+10, -3) (Diff)
/intern/cycles/render/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/render/graph.cpp (+5, -5) (Diff)
/intern/cycles/render/graph.h (+13, -0) (Diff)
/intern/cycles/render/light.cpp (+3, -3) (Diff)
/intern/cycles/render/nodes.cpp (+71, -1) (Diff)
/intern/cycles/render/nodes.h (+4, -0) (Diff)
/intern/cycles/render/object.cpp (+0, -40) (Diff)
/intern/cycles/render/object.h (+0, -8) (Diff)
/intern/cycles/render/osl.cpp (+2, -1) (Diff)
/intern/cycles/render/scene.cpp (+14, -1) (Diff)
/intern/cycles/render/scene.h (+4, -0) (Diff)
/intern/ghost/intern/GHOST_DropTargetWin32.cpp (+0, -4) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.cpp (+1, -1) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+11, -1) (Diff)
/intern/guardedalloc/intern/mmap_win.c (+1, -1) (Diff)
/intern/opennl/intern/opennl.c (+2, -0) (Diff)
/release/scripts/startup/bl_operators/object_quick_effects.py (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+0, -2) (Diff)
/source/blender/blenkernel/BKE_anim.h (+0, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_utildefines.h (+1, -49) (Diff)
/source/blender/blenkernel/intern/anim.c (+24, -26) (Diff)
/source/blender/blenkernel/intern/anim_sys.c (+26, -11) (Diff)
/source/blender/blenkernel/intern/armature.c (+14, -13) (Diff)
/source/blender/blenkernel/intern/blender.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/customdata.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/customdata_file.c (+14, -20) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+21, -0) (Diff)
/source/blender/blenkernel/intern/fcurve.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/font.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/idprop.c (+0, -12) (Diff)
/source/blender/blenkernel/intern/image.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/library.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/mask_evaluate.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/mball.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/ocean.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/sca.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/seqeffects.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/seqmodifier.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/sound.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/texture.c (+0, -1) (Diff)
/source/blender/blenkernel/intern/tracking.c (+2, -0) (Diff)
/source/blender/blenlib/BLI_fileops.h (+7, -0) (Diff)
/source/blender/blenlib/BLI_path_util.h (+8, -0) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+0, -24) (Diff)
/source/blender/blenlib/CMakeLists.txt (+3, -0) (Diff)
/source/blender/blenlib/intern/BLI_memarena.c (+2, -2) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+1, -1) (Diff)
/source/blender/blenlib/intern/bpath.c (+0, -1) (Diff)
/source/blender/blenlib/intern/fileops.c (+0, -2) (Diff)
/source/blender/blenlib/intern/path_util.c (+0, -1) (Diff)
/source/blender/blenlib/intern/storage.c (+2, -5) (Diff)
/source/blender/blenlib/intern/winstuff.c (+1, -1) (Diff)
/source/blender/blenloader/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+3, -2) (Diff)
/source/blender/blenloader/intern/readfile.c (+36, -93) (Diff)
/source/blender/blenloader/intern/runtime.c (+0, -1) (Diff)
/source/blender/blenloader/intern/versioning_250.c (+0, -1) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+0, -1) (Diff)
/source/blender/blenloader/intern/writefile.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+6, -3) (Diff)
/source/blender/bmesh/intern/bmesh_marking.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+4, -4) (Diff)
/source/blender/bmesh/operators/bmo_extrude.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_inset.c (+2, -1) (Diff)
/source/blender/bmesh/tools/BME_bevel.c (+0, -1) (Diff)
/source/blender/collada/AnimationImporter.cpp (+3, -4) (Diff)
/source/blender/collada/DocumentExporter.cpp (+0, -1) (Diff)
/source/blender/collada/DocumentImporter.cpp (+7, -5) (Diff)
/source/blender/collada/ImageExporter.cpp (+0, -1) (Diff)
/source/blender/collada/MeshImporter.cpp (+1, -1) (Diff)
/source/blender/compositor/intern/COM_compositor.cpp (+13, -7) (Diff)
/source/blender/compositor/intern/COM_WorkScheduler.cpp (+91, -52) (Diff)
/source/blender/compositor/intern/COM_WorkScheduler.h (+3, -1) (Diff)
/source/blender/compositor/nodes/COM_MovieClipNode.cpp (+8, -3) (Diff)
/source/blender/compositor/nodes/COM_OutputFileNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_AntiAliasOperation.cpp (+0, -1) (Diff)
/source/blender/compositor/operations/COM_MovieClipOperation.cpp (+3, -7) (Diff)
/source/blender/compositor/operations/COM_OutputFileOperation.h (+2, -1) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_deps.c (+0, -1) (Diff)
/source/blender/editors/animation/anim_filter.c (+0, -1) (Diff)
/source/blender/editors/animation/keyframes_general.c (+0, -1) (Diff)
/source/blender/editors/include/ED_mesh.h (+1, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+6, -4) (Diff)
/source/blender/editors/include/UI_view2d.h (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+14, -5) (Diff)
/source/blender/editors/interface/interface_handlers.c (+23, -15) (Diff)
/source/blender/editors/interface/interface_icons.c (+0, -1) (Diff)
/source/blender/editors/interface/interface_intern.h (+8, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+14, -21) (Diff)
/source/blender/editors/interface/interface_style.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_templates.c (+8, -0) (Diff)
/source/blender/editors/interface/interface_widgets.c (+2, -3) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+162, -83) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+4, -3) (Diff)
/source/blender/editors/mesh/mesh_data.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+1, -1) (Diff)
/source/blender/editors/object/object_vgroup.c (+20, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+17, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+5, -3) (Diff)
/source/blender/editors/space_image/space_image.c (+5, -4) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+15, -6) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+7, -4) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+9, -7) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+4, -1) (Diff)
/source/blender/editors/space_view3d/view3d_intern.h (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+1, -0) (Diff)
/source/blender/editors/transform/transform.c (+55, -23) (Diff)
/source/blender/editors/transform/transform.h (+2, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+1, -2) (Diff)
/source/blender/editors/util/ed_util.c (+5, -1) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+3, -3) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+6, -5) (Diff)
/source/blender/editors/uvedit/uvedit_unwrap_ops.c (+11, -3) (Diff)
/source/blender/gpu/GPU_buffers.h (+6, -6) (Diff)
/source/blender/gpu/GPU_draw.h (+1, -1) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -1) (Diff)
/source/blender/gpu/GPU_material.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+4, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+2, -2) (Diff)
/source/blender/gpu/intern/gpu_material.c (+13, -12) (Diff)
/source/blender/ikplugin/intern/itasc_plugin.cpp (+0, -1) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+2, -2) (Diff)
/source/blender/imbuf/intern/bmp.c (+1, -1) (Diff)
/source/blender/imbuf/intern/IMB_indexer.h (+0, -1) (Diff)
/source/blender/imbuf/intern/indexer.c (+11, -8) (Diff)
/source/blender/imbuf/intern/indexer_dv.c (+4, -1) (Diff)
/source/blender/imbuf/intern/thumbs.c (+0, -2) (Diff)
/source/blender/imbuf/intern/thumbs_blend.c (+8, -6) (Diff)
/source/blender/imbuf/intern/util.c (+4, -19) (Diff)
/source/blender/makesdna/DNA_ipo_types.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_sdna_types.h (+1, -6) (Diff)
/source/blender/makesrna/intern/makesrna.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_armature.c (+13, -1) (Diff)
/source/blender/makesrna/intern/rna_camera_api.c (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_fluidsim.c (+4, -3) (Diff)
/source/blender/makesrna/intern/rna_gpencil.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_main.c (+2, -3) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_render.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_scene_api.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -6) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+1, -2) (Diff)
/source/blender/makesrna/intern/rna_wm_api.c (+18, -3) (Diff)
/source/blender/modifiers/intern/MOD_fluidsim_util.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_mirror.c (+0, -1) (Diff)
/source/blender/modifiers/intern/MOD_ocean.c (+0, -1) (Diff)
/source/blender/nodes/composite/nodes/node_composite_outputFile.c (+0, -2) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+0, -1) (Diff)
/source/blender/nodes/intern/node_common.c (+0, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_particle_info.c (+7, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_texture.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+3, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+3, -1) (Diff)
/source/blender/nodes/shader/node_shader_tree.c (+23, -24) (Diff)
/source/blender/nodes/texture/node_texture_tree.c (+30, -30) (Diff)
/source/blender/python/generic/py_capi_utils.c (+9, -0) (Diff)
/source/blender/quicktime/apple/qtkit_export.m (+26, -25) (Diff)
/source/blender/render/extern/include/RE_render_ext.h (+1, -1) (Diff)
/source/blender/render/intern/include/pixelshading.h (+3, -3) (Diff)
/source/blender/render/intern/source/pipeline.c (+0, -1) (Diff)
/source/blender/render/intern/source/render_result.c (+0, -1) (Diff)
/source/blender/render/intern/source/texture_ocean.c (+0, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+0, -1) (Diff)
/source/blender/windowmanager/WM_keymap.h (+3, -3) (Diff)
/source/blender/windowmanager/WM_types.h (+0, -1) (Diff)
/source/creator/CMakeLists.txt (+8, -0) (Diff)
/source/creator/creator.c (+0, -1) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+127, -56) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+1, -2) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+68, -10) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+18, -2) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.h (+10, -0) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021