Blender Git Loki

Git Commits -> Revision b214ea3

Revision b214ea3 by Campbell Barton
May 16, 2013, 10:43 (GMT)
svn merge ^/trunk/blender -c56620 -c56639 -c56643 -c56647 -c56648 -c56650 -c56651 -c56653 -c56654 -c56661 -c56662 -c56663 -c56668 -c56670 -c56671 -c56672 -c56673 -c56674 -c56676 -c56678 -c56679 -c56680 -c56682 -c56688 -c56689 -c56698 -c56700 -c56707 -c56711 -c56735 -c56745 -c56747 -c56748 -c56749 -c56755 -c56756 -c56759 -c56760 -c56763 -c56766 -c56767 -c56773 -c56778 -c56783 -c56784 -c56785 -c56790 -c56791 -c56793 -c56800 -c56806 -c56807 -c56809 -c56815 -c56816 -c56820

Commit Details:

Full Hash: b214ea3aa402fe8d377de38276a068456a5c5223
SVN Revision: 56847
Parent Commit: 6618133
Lines Changed: +842, -439

102 Modified Paths:

/intern/cycles/blender/blender_mesh.cpp (+10, -3) (Diff)
/intern/cycles/blender/blender_shader.cpp (+1, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+5, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+1, -0) (Diff)
/intern/cycles/kernel/shaders/node_normal_map.osl (+11, -6) (Diff)
/intern/cycles/kernel/shaders/node_rgb_ramp.osl (+2, -1) (Diff)
/intern/cycles/kernel/svm/svm_ramp.h (+13, -12) (Diff)
/intern/cycles/kernel/svm/svm_tex_coord.h (+6, -1) (Diff)
/intern/cycles/render/graph.cpp (+41, -31) (Diff)
/intern/cycles/render/graph.h (+2, -1) (Diff)
/intern/cycles/render/nodes.cpp (+9, -1) (Diff)
/intern/cycles/render/nodes.h (+1, -0) (Diff)
/intern/cycles/render/shader.cpp (+6, -0) (Diff)
/release/scripts/startup/bl_operators/node.py (+2, -0) (Diff)
/release/scripts/startup/bl_operators/view3d.py (+4, -0) (Diff)
/source/blender/blenkernel/BKE_curve.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/constraint.c (+11, -9) (Diff)
/source/blender/blenkernel/intern/curve.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/customdata.c (+6, -2) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+8, -4) (Diff)
/source/blender/blenkernel/intern/displist.c (+7, -1) (Diff)
/source/blender/blenkernel/intern/freestyle.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/lamp.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/material.c (+4, -2) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+2, -2) (Diff)
/source/blender/blenlib/intern/string.c (+50, -12) (Diff)
/source/blender/bmesh/intern/bmesh_walkers_impl.c (+104, -63) (Diff)
/source/blender/bmesh/operators/bmo_edgesplit.c (+1, -0) (Diff)
/source/blender/compositor/nodes/COM_GroupNode.cpp (+89, -0) (Diff)
/source/blender/compositor/nodes/COM_GroupNode.h (+4, -0) (Diff)
/source/blender/compositor/nodes/COM_ViewerNode.cpp (+2, -3) (Diff)
/source/blender/compositor/nodes/COM_ZCombineNode.cpp (+12, -3) (Diff)
/source/blender/compositor/operations/COM_BlurBaseOperation.h (+2, -0) (Diff)
/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp (+3, -6) (Diff)
/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp (+3, -6) (Diff)
/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp (+2, -4) (Diff)
/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp (+2, -4) (Diff)
/source/blender/compositor/operations/COM_ZCombineOperation.cpp (+6, -15) (Diff)
/source/blender/editors/armature/armature_ops.c (+8, -1) (Diff)
/source/blender/editors/curve/curve_ops.c (+4, -2) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -2) (Diff)
/source/blender/editors/include/UI_view2d.h (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+3, -3) (Diff)
/source/blender/editors/interface/interface_handlers.c (+33, -13) (Diff)
/source/blender/editors/interface/interface_layout.c (+17, -4) (Diff)
/source/blender/editors/interface/interface_regions.c (+24, -9) (Diff)
/source/blender/editors/interface/interface_templates.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+9, -3) (Diff)
/source/blender/editors/interface/resources.c (+3, -1) (Diff)
/source/blender/editors/interface/view2d.c (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+9, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+4, -6) (Diff)
/source/blender/editors/sculpt_paint/paint_image_2d.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+4, -10) (Diff)
/source/blender/editors/sculpt_paint/paint_intern.h (+3, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+18, -2) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+2, -1) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+19, -12) (Diff)
/source/blender/editors/space_action/action_ops.c (+5, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+15, -7) (Diff)
/source/blender/editors/space_graph/graph_ops.c (+5, -1) (Diff)
/source/blender/editors/space_logic/logic_window.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_ops.c (+4, -1) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+30, -5) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+4, -0) (Diff)
/source/blender/editors/space_text/space_text.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+3, -2) (Diff)
/source/blender/editors/transform/transform.c (+12, -13) (Diff)
/source/blender/freestyle/intern/application/Controller.cpp (+5, -0) (Diff)
/source/blender/freestyle/intern/geometry/Bezier.cpp (+5, -0) (Diff)
/source/blender/freestyle/intern/geometry/FitCurve.cpp (+2, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_Convert.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp (+6, -6) (Diff)
/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp (+7, -0) (Diff)
/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h (+1, -1) (Diff)
/source/blender/freestyle/intern/system/PseudoNoise.cpp (+1, -4) (Diff)
/source/blender/freestyle/intern/system/PseudoNoise.h (+2, -1) (Diff)
/source/blender/freestyle/intern/system/TimeStamp.cpp (+1, -1) (Diff)
/source/blender/freestyle/intern/system/TimeStamp.h (+2, -4) (Diff)
/source/blender/makesrna/intern/rna_access.c (+23, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+4, -1) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+18, -35) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+3, -0) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+3, -2) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_array.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_boolean.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna.c (+5, -13) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -1) (Diff)
/source/blender/render/intern/source/imagetexture.c (+6, -3) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+6, -0) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+1, -2) (Diff)
/source/blender/windowmanager/intern/wm_keymap.c (+11, -16) (Diff)
/source/blender/windowmanager/WM_api.h (+2, -0) (Diff)
/source/blender/windowmanager/WM_keymap.h (+1, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+4, -2) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+2, -2) (Diff)
/source/gameengine/Ketsji/BL_Action.cpp (+8, -23) (Diff)
/source/gameengine/Ketsji/BL_Action.h (+0, -1) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+2, -2) (Diff)
/source/gameengine/Rasterizer/RAS_BucketManager.cpp (+10, -2) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021