Blender Git Loki

Git Commits -> Revision 1228ec8

Revision 1228ec8 by Antonis Ryakiotakis (soc-2013-paint)
August 23, 2013, 10:18 (GMT)
Merge trunk -r59408 into soc-2013-paint

Conflicts:
source/blender/editors/sculpt_paint/paint_stroke.c

Commit Details:

Full Hash: 1228ec88cc9a6d0448a510592c365fb3f2bc00b6
SVN Revision: 59410
Parent Commit: 497a877
Lines Changed: +2395, -1608

4 Added Paths:

/source/blender/bmesh/bmesh_tools.h (+49, -0) (View)
/source/blender/bmesh/operators/bmo_bisect_plane.c (+102, -0) (View)
/source/blender/bmesh/tools/bmesh_bisect_plane.c (+412, -0) (View)
/source/blender/bmesh/tools/bmesh_bisect_plane.h (+34, -0) (View)

145 Modified Paths:

/build_files/build_environment/install_deps.sh (+3, -1) (Diff)
/build_files/cmake/macros.cmake (+31, -0) (Diff)
/intern/atomic/atomic_ops.h (+3, -3) (Diff)
/intern/cycles/blender/addon/presets.py (+1, -1) (Diff)
/intern/cycles/blender/addon/properties.py (+2, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+49, -9) (Diff)
/intern/cycles/blender/blender_curves.cpp (+0, -2) (Diff)
/intern/cycles/blender/blender_object.cpp (+2, -2) (Diff)
/intern/cycles/blender/blender_sync.cpp (+6, -4) (Diff)
/intern/cycles/kernel/kernel_bvh.h (+3, -2) (Diff)
/intern/cycles/kernel/kernel_bvh_subsurface.h (+7, -3) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+6, -0) (Diff)
/intern/cycles/render/curves.h (+0, -10) (Diff)
/intern/ghost/intern/GHOST_SystemPathsX11.cpp (+28, -22) (Diff)
/release/datafiles/prvicons.png (+0, -0) (Diff)
/release/scripts/freestyle/style_modules/parameter_editor.py (+167, -33) (Diff)
/release/scripts/presets/cycles/sampling/final.py (+4, -4) (Diff)
/release/scripts/presets/cycles/sampling/preview.py (+4, -4) (Diff)
/release/scripts/startup/bl_operators/wm.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/properties_mask_common.py (+2, -4) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+4, -1) (Diff)
/source/blender/blenkernel/BKE_curve.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_displist.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+4, -4) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+0, -2) (Diff)
/source/blender/blenkernel/intern/brush.c (+1, -2) (Diff)
/source/blender/blenkernel/intern/curve.c (+38, -25) (Diff)
/source/blender/blenkernel/intern/displist.c (+29, -34) (Diff)
/source/blender/blenkernel/intern/mesh.c (+11, -6) (Diff)
/source/blender/blenkernel/intern/modifiers_bmesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/pbvh_bmesh.c (+27, -20) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+45, -0) (Diff)
/source/blender/blenkernel/intern/sound.c (+2, -0) (Diff)
/source/blender/blenlib/BLI_fileops.h (+6, -0) (Diff)
/source/blender/blenlib/BLI_ghash.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_math_geom.h (+12, -3) (Diff)
/source/blender/blenlib/BLI_math_interp.h (+3, -3) (Diff)
/source/blender/blenlib/BLI_math_rotation.h (+4, -4) (Diff)
/source/blender/blenlib/BLI_math_vector.h (+18, -12) (Diff)
/source/blender/blenlib/BLI_memarena.h (+7, -3) (Diff)
/source/blender/blenlib/BLI_sort.h (+5, -1) (Diff)
/source/blender/blenlib/BLI_winstuff.h (+0, -1) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+6, -7) (Diff)
/source/blender/blenlib/intern/BLI_memarena.c (+42, -7) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+1, -1) (Diff)
/source/blender/blenlib/intern/edgehash.c (+4, -2) (Diff)
/source/blender/blenlib/intern/math_geom.c (+60, -27) (Diff)
/source/blender/blenlib/intern/math_geom_inline.c (+5, -0) (Diff)
/source/blender/blenlib/intern/math_rotation.c (+10, -9) (Diff)
/source/blender/blenlib/intern/math_vector_inline.c (+32, -17) (Diff)
/source/blender/blenlib/intern/sort.c (+20, -9) (Diff)
/source/blender/blenlib/intern/storage.c (+2, -13) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -0) (Diff)
/source/blender/bmesh/bmesh.h (+1, -8) (Diff)
/source/blender/bmesh/CMakeLists.txt (+7, -1) (Diff)
/source/blender/bmesh/intern/bmesh_construct.c (+16, -74) (Diff)
/source/blender/bmesh/intern/bmesh_construct.h (+7, -8) (Diff)
/source/blender/bmesh/intern/bmesh_core.c (+61, -22) (Diff)
/source/blender/bmesh/intern/bmesh_core.h (+10, -3) (Diff)
/source/blender/bmesh/intern/bmesh_log.c (+6, -6) (Diff)
/source/blender/bmesh/intern/bmesh_mesh_conv.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_mods.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_opdefines.c (+28, -1) (Diff)
/source/blender/bmesh/intern/bmesh_operators_private.h (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_bevel.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_bridge.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_create.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_dissolve.c (+2, -0) (Diff)
/source/blender/bmesh/operators/bmo_dupe.c (+94, -95) (Diff)
/source/blender/bmesh/operators/bmo_edgenet.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_extrude.c (+5, -5) (Diff)
/source/blender/bmesh/operators/bmo_fill_edgeloop.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_fill_grid.c (+3, -3) (Diff)
/source/blender/bmesh/operators/bmo_fill_holes.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_hull.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_inset.c (+233, -209) (Diff)
/source/blender/bmesh/operators/bmo_poke.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_primitive.c (+21, -21) (Diff)
/source/blender/bmesh/operators/bmo_removedoubles.c (+1, -3) (Diff)
/source/blender/bmesh/operators/bmo_split_edges.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_symmetrize.c (+49, -624) (Diff)
/source/blender/bmesh/operators/bmo_triangulate.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_unsubdivide.c (+1, -0) (Diff)
/source/blender/bmesh/operators/bmo_utils.c (+4, -2) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+4, -4) (Diff)
/source/blender/bmesh/tools/bmesh_bevel.c (+9, -19) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c (+1, -2) (Diff)
/source/blender/bmesh/tools/bmesh_edgenet.c (+2, -1) (Diff)
/source/blender/editors/datafiles/CMakeLists.txt (+9, -0) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+10, -1) (Diff)
/source/blender/editors/interface/interface_templates.c (+3, -2) (Diff)
/source/blender/editors/mask/mask_edit.c (+13, -1) (Diff)
/source/blender/editors/mask/mask_intern.h (+2, -0) (Diff)
/source/blender/editors/mask/mask_ops.c (+107, -0) (Diff)
/source/blender/editors/mesh/editmesh_inset.c (+2, -4) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_path.c (+3, -0) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+4, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+10, -2) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+2, -2) (Diff)
/source/blender/editors/metaball/mball_edit.c (+2, -0) (Diff)
/source/blender/editors/object/object_edit.c (+3, -2) (Diff)
/source/blender/editors/object/object_vgroup.c (+5, -2) (Diff)
/source/blender/editors/render/render_internal.c (+12, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_hide.c (+1, -13) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+0, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+4, -0) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+3, -0) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+25, -12) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+4, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+26, -8) (Diff)
/source/blender/editors/space_image/space_image.c (+4, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+3, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+4, -4) (Diff)
/source/blender/editors/transform/transform.c (+23, -20) (Diff)
/source/blender/editors/transform/transform.h (+1, -0) (Diff)
/source/blender/editors/transform/transform_constraints.c (+8, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+9, -4) (Diff)
/source/blender/editors/transform/transform_generics.c (+1, -0) (Diff)
/source/blender/imbuf/intern/imageprocess.c (+9, -5) (Diff)
/source/blender/imbuf/intern/IMB_colormanagement_intern.h (+3, -3) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+1, -0) (Diff)
/source/blender/makesdna/DNA_space_types.h (+3, -2) (Diff)
/source/blender/makesrna/intern/rna_actuator.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_define.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_meta.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+10, -1) (Diff)
/source/blender/makesrna/intern/rna_tracking.c (+118, -24) (Diff)
/source/blender/modifiers/intern/MOD_bevel.c (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_decimate.c (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_edgesplit.c (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_skin.c (+3, -15) (Diff)
/source/blender/modifiers/intern/MOD_triangulate.c (+3, -0) (Diff)
/source/blender/python/bmesh/bmesh_py_types.c (+4, -7) (Diff)
/source/blender/python/bmesh/bmesh_py_types_customdata.c (+1, -0) (Diff)
/source/blender/python/mathutils/mathutils_Vector.c (+1, -1) (Diff)
/source/gameengine/Ketsji/BL_ActionManager.h (+4, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+4, -4) (Diff)
/source/gameengine/Ketsji/KX_RaySensor.h (+2, -2) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021