Blender Git Loki

Git Commits -> Revision ac31757

Revision ac31757 by Antonis Ryakiotakis (soc-2013-paint)
August 1, 2013, 17:18 (GMT)
Merge trunk -r 58803 into soc-2013-paint

Commit Details:

Full Hash: ac3175734edb7d18448dcf4ec4db1a421e9570cf
SVN Revision: 58807
Parent Commit: 6d4f941
Lines Changed: +2583, -722

13 Added Paths:

/intern/cycles/kernel/shaders/node_blackbody.osl (+33, -0) (View)
/intern/cycles/kernel/shaders/node_combine_hsv.osl (+29, -0) (View)
/intern/cycles/kernel/shaders/node_separate_hsv.osl (+33, -0) (View)
/intern/cycles/kernel/shaders/node_vector_transform.osl (+38, -0) (View)
/intern/cycles/kernel/svm/svm_blackbody.h (+84, -0) (View)
/intern/cycles/kernel/svm/svm_sepcomb_hsv.h (+56, -0) (View)
/intern/cycles/kernel/svm/svm_vector_transform.h (+103, -0) (View)
/intern/cycles/render/blackbody.cpp (+140, -0) (View)
/intern/cycles/render/blackbody.h (+30, -0) (View)
/source/blender/bmesh/operators/bmo_connect_nonplanar.c (+229, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_blackbody.c (+54, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c (+80, -0) (View)
/source/blender/nodes/shader/nodes/node_shader_vectTransform.c (+66, -0) (View)

153 Modified Paths:

/doc/python_api/rst/bge.render.rst (+24, -0) (Diff)
/extern/libmv/libmv-capi.cc (+123, -121) (Diff)
/extern/libmv/libmv-capi.h (+62, -69) (Diff)
/extern/libmv/libmv-capi_stub.cc (+51, -48) (Diff)
/intern/cycles/blender/addon/ui.py (+3, -1) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+1, -1) (Diff)
/intern/cycles/blender/blender_session.cpp (+5, -0) (Diff)
/intern/cycles/blender/blender_shader.cpp (+17, -0) (Diff)
/intern/cycles/blender/blender_sync.cpp (+2, -3) (Diff)
/intern/cycles/bvh/bvh.h (+1, -1) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+3, -0) (Diff)
/intern/cycles/kernel/kernel_displace.h (+1, -1) (Diff)
/intern/cycles/kernel/kernel_emission.h (+10, -10) (Diff)
/intern/cycles/kernel/kernel_object.h (+10, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+14, -17) (Diff)
/intern/cycles/kernel/kernel_shader.h (+7, -4) (Diff)
/intern/cycles/kernel/kernel_types.h (+17, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+10, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+1, -0) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/kernel/shaders/node_light_path.osl (+6, -1) (Diff)
/intern/cycles/kernel/svm/svm.h (+15, -0) (Diff)
/intern/cycles/kernel/svm/svm_light_path.h (+1, -0) (Diff)
/intern/cycles/kernel/svm/svm_types.h (+18, -1) (Diff)
/intern/cycles/render/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/render/graph.h (+1, -0) (Diff)
/intern/cycles/render/nodes.cpp (+154, -1) (Diff)
/intern/cycles/render/nodes.h (+29, -0) (Diff)
/intern/cycles/render/shader.cpp (+26, -0) (Diff)
/intern/cycles/render/shader.h (+2, -0) (Diff)
/intern/cycles/render/svm.cpp (+5, -0) (Diff)
/intern/ghost/CMakeLists.txt (+2, -0) (Diff)
/intern/ghost/GHOST_C-api.h (+13, -0) (Diff)
/intern/ghost/GHOST_IWindow.h (+13, -0) (Diff)
/intern/ghost/intern/GHOST_C-api.cpp (+13, -0) (Diff)
/intern/ghost/intern/GHOST_Window.h (+21, -0) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+14, -0) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.h (+13, -0) (Diff)
/intern/ghost/intern/GHOST_WindowX11.cpp (+22, -0) (Diff)
/intern/ghost/intern/GHOST_WindowX11.h (+13, -0) (Diff)
/intern/ghost/SConscript (+1, -2) (Diff)
/release/scripts/presets/cycles/sampling/final.py (+6, -3) (Diff)
/release/scripts/presets/cycles/sampling/preview.py (+6, -3) (Diff)
/release/scripts/startup/bl_ui/properties_game.py (+3, -0) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+6, -12) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+11, -7) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+4, -0) (Diff)
/release/scripts/templates_py/custom_nodes.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+4, -0) (Diff)
/source/blender/blenkernel/intern/key.c (+7, -7) (Diff)
/source/blender/blenkernel/intern/node.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/smoke.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/tracking.c (+33, -33) (Diff)
/source/blender/blenlib/BLI_array.h (+5, -5) (Diff)
/source/blender/blenlib/BLI_ghash.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_math_matrix.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+3, -0) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+2, -1) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+9, -2) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+15, -0) (Diff)
/source/blender/bmesh/CMakeLists.txt (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_interp.c (+3, -0) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+22, -0) (Diff)
/source/blender/bmesh/intern/bmesh_operators_private.h (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+5, -4) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+12, -0) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+2, -0) (Diff)
/source/blender/bmesh/operators/bmo_connect_pair.c (+6, -12) (Diff)
/source/blender/bmesh/operators/bmo_inset.c (+2, -0) (Diff)
/source/blender/bmesh/operators/bmo_utils.c (+1, -1) (Diff)
/source/blender/collada/ArmatureImporter.cpp (+17, -6) (Diff)
/source/blender/collada/collada_internal.cpp (+44, -2) (Diff)
/source/blender/collada/collada_internal.h (+4, -2) (Diff)
/source/blender/collada/collada_utils.cpp (+15, -50) (Diff)
/source/blender/collada/collada_utils.h (+2, -1) (Diff)
/source/blender/collada/DocumentImporter.cpp (+33, -13) (Diff)
/source/blender/collada/SkinInfo.cpp (+2, -2) (Diff)
/source/blender/collada/TransformReader.cpp (+3, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+2, -2) (Diff)
/source/blender/editors/armature/armature_select.c (+1, -1) (Diff)
/source/blender/editors/armature/pose_select.c (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+2, -1) (Diff)
/source/blender/editors/interface/interface_handlers.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_ops.c (+3, -3) (Diff)
/source/blender/editors/interface/interface_regions.c (+3, -5) (Diff)
/source/blender/editors/interface/view2d_ops.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+53, -8) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+1, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+1, -0) (Diff)
/source/blender/editors/object/object_bake.c (+12, -11) (Diff)
/source/blender/editors/object/object_edit.c (+4, -4) (Diff)
/source/blender/editors/render/render_opengl.c (+2, -6) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+2, -2) (Diff)
/source/blender/editors/screen/screen_ops.c (+6, -5) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+2, -2) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+5, -5) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+12, -5) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_image/image_buttons.c (+4, -4) (Diff)
/source/blender/editors/space_logic/logic_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_nla/nla_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_node/drawnode.c (+10, -0) (Diff)
/source/blender/editors/space_node/node_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_relationships.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_select.c (+1, -1) (Diff)
/source/blender/editors/space_node/node_toolbar.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_view.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+41, -41) (Diff)
/source/blender/editors/space_outliner/outliner_edit.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_intern.h (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+2, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+8, -11) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_snap.c (+14, -14) (Diff)
/source/blender/editors/space_view3d/view3d_toolbar.c (+3, -3) (Diff)
/source/blender/editors/transform/transform_conversions.c (+10, -6) (Diff)
/source/blender/makesdna/DNA_mesh_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_node_types.h (+15, -0) (Diff)
/source/blender/makesdna/DNA_outliner_types.h (+0, -2) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+7, -1) (Diff)
/source/blender/makesdna/DNA_sound_types.h (+0, -1) (Diff)
/source/blender/makesrna/intern/makesrna.c (+53, -53) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+36, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+12, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+3, -0) (Diff)
/source/blender/nodes/intern/node_common.c (+27, -10) (Diff)
/source/blender/nodes/intern/node_exec.c (+4, -0) (Diff)
/source/blender/nodes/NOD_shader.h (+4, -0) (Diff)
/source/blender/nodes/NOD_static_types.h (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_light_path.c (+1, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_math.c (+1, -0) (Diff)
/source/blender/nodes/texture/nodes/node_texture_output.c (+7, -8) (Diff)
/source/blender/quicktime/apple/quicktime_export.c (+5, -5) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/voxeldata.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+12, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+7, -7) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+14, -3) (Diff)
/source/blender/windowmanager/WM_api.h (+2, -0) (Diff)
/source/blender/windowmanager/wm_window.h (+2, -0) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+9, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp (+10, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h (+10, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp (+10, -0) (Diff)
/source/gameengine/BlenderRoutines/KX_BlenderGL.h (+2, -0) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+6, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp (+14, -0) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Canvas.h (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+32, -0) (Diff)
/source/gameengine/Rasterizer/RAS_ICanvas.h (+11, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021