Blender Git Loki
Git Commits -> Revision 05ac192
Revision 05ac192 by Antonis Ryakiotakis (soc-2013-paint) July 15, 2013, 15:08 (GMT) |
Merge trunk -r58222 into soc-2013-paint |
Commit Details:
Full Hash: 05ac192431afd45c57f002cf53d189adda148997
SVN Revision: 58272
Parent Commit: d6759c5
Lines Changed: +355, -208
67 Modified Paths:
/intern/cycles/blender/addon/ui.py (+14, -12) (Diff)
/source/blender/blenfont/intern/blf_font.c (+1, -1) (Diff)
/source/blender/blenkernel/BKE_object.h (+3, -2) (Diff)
/source/blender/blenkernel/intern/boids.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/brush.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/constraint.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/fcurve.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/lattice.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/linestyle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/mask_rasterize.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/mball.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/object.c (+30, -15) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+46, -6) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_math_geom.h (+2, -1) (Diff)
/source/blender/blenlib/intern/math_geom.c (+63, -48) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+9, -1) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_connect_pair.c (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ZCombineNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp (+6, -5) (Diff)
/source/blender/editors/animation/anim_markers.c (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+2, -1) (Diff)
/source/blender/editors/interface/interface_layout.c (+2, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+3, -1) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+0, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+15, -8) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+1, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+1, -0) (Diff)
/source/blender/editors/space_clip/space_clip.c (+1, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -0) (Diff)
/source/blender/editors/space_node/node_select.c (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -6) (Diff)
/source/blender/editors/space_time/space_time.c (+18, -2) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_snap.c (+4, -4) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+11, -1) (Diff)
/source/blender/editors/uvedit/uvedit_parametrizer.c (+2, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+6, -3) (Diff)
/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/view_map/BoxGrid.cpp (+4, -0) (Diff)
/source/blender/freestyle/intern/view_map/GridDensityProvider.h (+22, -17) (Diff)
/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/view_map/SphericalGrid.cpp (+4, -0) (Diff)
/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp (+3, -0) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+1, -5) (Diff)
/source/blender/imbuf/intern/util.c (+14, -5) (Diff)
/source/blender/makesdna/intern/makesdna.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -10) (Diff)
/source/blender/modifiers/intern/MOD_screw.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_engine.h (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+10, -3) (Diff)
/source/blender/render/intern/source/external_engine.c (+4, -10) (Diff)
/source/blender/render/intern/source/render_texture.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+3, -2) (Diff)
/source/blender/blenfont/intern/blf_font.c (+1, -1) (Diff)
/source/blender/blenkernel/BKE_object.h (+3, -2) (Diff)
/source/blender/blenkernel/intern/boids.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/brush.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/constraint.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/fcurve.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/lattice.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/linestyle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/mask_rasterize.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/material.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/mball.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+0, -3) (Diff)
/source/blender/blenkernel/intern/object.c (+30, -15) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+46, -6) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_math_geom.h (+2, -1) (Diff)
/source/blender/blenlib/intern/math_geom.c (+63, -48) (Diff)
/source/blender/blenlib/intern/math_matrix.c (+9, -1) (Diff)
/source/blender/blenloader/intern/versioning_legacy.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_connect_pair.c (+1, -1) (Diff)
/source/blender/compositor/nodes/COM_ZCombineNode.cpp (+1, -1) (Diff)
/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp (+6, -5) (Diff)
/source/blender/editors/animation/anim_markers.c (+1, -1) (Diff)
/source/blender/editors/interface/interface.c (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+2, -1) (Diff)
/source/blender/editors/interface/interface_layout.c (+2, -0) (Diff)
/source/blender/editors/interface/interface_regions.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+3, -1) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+0, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+15, -8) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+1, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+1, -0) (Diff)
/source/blender/editors/space_clip/space_clip.c (+1, -1) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+1, -0) (Diff)
/source/blender/editors/space_node/node_select.c (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -6) (Diff)
/source/blender/editors/space_time/space_time.c (+18, -2) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_snap.c (+4, -4) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+11, -1) (Diff)
/source/blender/editors/uvedit/uvedit_parametrizer.c (+2, -2) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp (+6, -3) (Diff)
/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/view_map/BoxGrid.cpp (+4, -0) (Diff)
/source/blender/freestyle/intern/view_map/GridDensityProvider.h (+22, -17) (Diff)
/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp (+2, -2) (Diff)
/source/blender/freestyle/intern/view_map/SphericalGrid.cpp (+4, -0) (Diff)
/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp (+3, -0) (Diff)
/source/blender/imbuf/intern/colormanagement.c (+1, -5) (Diff)
/source/blender/imbuf/intern/util.c (+14, -5) (Diff)
/source/blender/makesdna/intern/makesdna.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -10) (Diff)
/source/blender/modifiers/intern/MOD_screw.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_solidify.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_engine.h (+1, -1) (Diff)
/source/blender/render/intern/source/convertblender.c (+10, -3) (Diff)
/source/blender/render/intern/source/external_engine.c (+4, -10) (Diff)
/source/blender/render/intern/source/render_texture.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+3, -2) (Diff)