Blender Git Loki

Git Commits -> Revision 78f4e9b

Revision 78f4e9b by Antonis Ryakiotakis (soc-2013-paint)
July 11, 2013, 17:56 (GMT)
Merge trunk -r58180 into soc-2013-paint

Commit Details:

Full Hash: 78f4e9b3a8b785f31ffcbe88a800c663196824b5
SVN Revision: 58181
Parent Commit: ef098ac
Lines Changed: +2397, -1230

2 Added Paths:

/release/scripts/modules/rna_keymap_ui.py (+384, -0) (View)
/source/blender/bmesh/operators/bmo_normals.c (+187, -0) (View)

1 Deleted Path:

/release/scripts/startup/bl_ui/space_userpref_keymap.py (+0, -391)

106 Modified Paths:

/build_files/cmake/Modules/FindPythonLibsUnix.cmake (+5, -3) (Diff)
/intern/cycles/blender/addon/__init__.py (+1, -0) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+3, -0) (Diff)
/intern/cycles/blender/blender_object.cpp (+1, -1) (Diff)
/intern/cycles/CMakeLists.txt (+4, -0) (Diff)
/intern/cycles/kernel/kernel_camera.h (+6, -6) (Diff)
/intern/cycles/render/buffers.cpp (+1, -1) (Diff)
/intern/cycles/render/graph.cpp (+2, -1) (Diff)
/intern/cycles/util/util_math.h (+36, -0) (Diff)
/release/scripts/freestyle/style_modules/parameter_editor.py (+2, -12) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+20, -5) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+0, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_scene.h (+11, -1) (Diff)
/source/blender/blenkernel/intern/customdata.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+64, -0) (Diff)
/source/blender/blenkernel/intern/mball.c (+24, -12) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/scene.c (+30, -34) (Diff)
/source/blender/blenkernel/intern/text.c (+1, -14) (Diff)
/source/blender/blenkernel/intern/unit.c (+10, -5) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+1, -0) (Diff)
/source/blender/blenlib/BLI_string_utf8.h (+3, -1) (Diff)
/source/blender/blenlib/BLI_threads.h (+12, -0) (Diff)
/source/blender/blenlib/intern/math_geom.c (+32, -8) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+7, -4) (Diff)
/source/blender/blenlib/intern/math_vector.c (+10, -0) (Diff)
/source/blender/blenlib/intern/string_utf8.c (+26, -22) (Diff)
/source/blender/blenlib/intern/threads.c (+46, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+5, -4) (Diff)
/source/blender/blenloader/intern/writefile.c (+6, -9) (Diff)
/source/blender/bmesh/CMakeLists.txt (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+50, -25) (Diff)
/source/blender/bmesh/intern/bmesh_construct.h (+6, -1) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+8, -6) (Diff)
/source/blender/bmesh/intern/bmesh_core.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_interp.c (+33, -37) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_mods.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+0, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators.c (+3, -3) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+113, -0) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+2, -0) (Diff)
/source/blender/bmesh/operators/bmo_bridge.c (+17, -2) (Diff)
/source/blender/bmesh/operators/bmo_utils.c (+0, -125) (Diff)
/source/blender/bmesh/tools/bmesh_bevel.c (+22, -5) (Diff)
/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp (+1, -1) (Diff)
/source/blender/editors/armature/armature_relations.c (+17, -1) (Diff)
/source/blender/editors/armature/armature_utils.c (+69, -34) (Diff)
/source/blender/editors/curve/editcurve.c (+111, -72) (Diff)
/source/blender/editors/include/ED_mesh.h (+1, -0) (Diff)
/source/blender/editors/include/ED_render.h (+2, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -3) (Diff)
/source/blender/editors/interface/interface.c (+135, -7) (Diff)
/source/blender/editors/interface/interface_handlers.c (+22, -6) (Diff)
/source/blender/editors/interface/interface_layout.c (+5, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+16, -4) (Diff)
/source/blender/editors/interface/interface_templates.c (+8, -4) (Diff)
/source/blender/editors/mesh/editface.c (+15, -9) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+37, -4) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+4, -3) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+8, -0) (Diff)
/source/blender/editors/mesh/meshtools.c (+4, -3) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_vgroup.c (+1, -1) (Diff)
/source/blender/editors/physics/particle_edit.c (+62, -30) (Diff)
/source/blender/editors/render/render_intern.h (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+177, -87) (Diff)
/source/blender/editors/render/render_preview.c (+2, -0) (Diff)
/source/blender/editors/render/render_update.c (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+11, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+48, -7) (Diff)
/source/blender/editors/space_node/node_edit.c (+4, -3) (Diff)
/source/blender/editors/space_node/space_node.c (+5, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+104, -45) (Diff)
/source/blender/editors/transform/transform.c (+60, -103) (Diff)
/source/blender/editors/transform/transform.h (+3, -3) (Diff)
/source/blender/editors/util/undo.c (+11, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+30, -5) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h (+1, -0) (Diff)
/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp (+22, -0) (Diff)
/source/blender/freestyle/intern/stroke/Canvas.h (+1, -0) (Diff)
/source/blender/freestyle/intern/stroke/ContextFunctions.cpp (+5, -0) (Diff)
/source/blender/freestyle/intern/stroke/ContextFunctions.h (+6, -1) (Diff)
/source/blender/freestyle/intern/view_map/ViewMap.cpp (+5, -0) (Diff)
/source/blender/imbuf/intern/tiff.c (+4, -2) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_access.c (+9, -0) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_object.c (+6, -3) (Diff)
/source/blender/makesrna/intern/rna_render.c (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+7, -1) (Diff)
/source/blender/python/bmesh/bmesh_py_types.c (+1, -1) (Diff)
/source/blender/python/generic/idprop_py_api.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna_array.c (+10, -4) (Diff)
/source/blender/render/extern/include/RE_engine.h (+12, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+22, -10) (Diff)
/source/blender/render/intern/source/envmap.c (+4, -0) (Diff)
/source/blender/render/intern/source/external_engine.c (+10, -3) (Diff)
/source/blender/render/intern/source/pipeline.c (+8, -2) (Diff)
/source/blender/windowmanager/intern/wm_jobs.c (+55, -7) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+2, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+3, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021