griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
be50ce61be7fdc96943dbdac79aabd88ba29996f
test2/source/blender/blenkernel
History
Tamito Kajiyama be50ce61be Merged 
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
2009-09-18 22:25:49 +00:00
..
intern
Merged
2009-09-18 22:25:49 +00:00
BKE_action.h
Merged
2009-09-18 22:25:49 +00:00
BKE_anim.h
Merged
2009-09-18 22:25:49 +00:00
BKE_animsys.h
Merged
2009-09-18 22:25:49 +00:00
BKE_armature.h
Merged
2009-09-18 22:25:49 +00:00
BKE_blender.h
Merged
2009-09-18 22:25:49 +00:00
BKE_bmesh.h
Merged
2009-09-18 22:25:49 +00:00
BKE_bmeshCustomData.h
Merged
2009-09-18 22:25:49 +00:00
BKE_bmfont_types.h
Patch from GSR that a) fixes a whole bunch of GPL/BL license
2008-04-16 22:40:48 +00:00
BKE_bmfont.h
Patch from GSR that a) fixes a whole bunch of GPL/BL license
2008-04-16 22:40:48 +00:00
BKE_boids.h
Merged
2009-09-18 22:25:49 +00:00
BKE_booleanops_mesh.h
Patch from GSR that a) fixes a whole bunch of GPL/BL license
2008-04-16 22:40:48 +00:00
BKE_booleanops.h
Merged
2009-09-18 22:25:49 +00:00
BKE_brush.h
Merged
2009-09-18 22:25:49 +00:00
BKE_bullet.h
Merged
2009-09-18 22:25:49 +00:00
BKE_bvhutils.h
Merged
2009-09-18 22:25:49 +00:00
BKE_cdderivedmesh.h
Added custom vertex/edge/face data for meshes:
2006-11-20 04:28:02 +00:00
BKE_cloth.h
Merged
2009-09-18 22:25:49 +00:00
BKE_collision.h
Merged
2009-09-18 22:25:49 +00:00
BKE_colortools.h
Merged
2009-09-18 22:25:49 +00:00
BKE_constraint.h
Merged
2009-09-18 22:25:49 +00:00
BKE_context.h
Merged
2009-09-18 22:25:49 +00:00
BKE_curve.h
Merged
2009-09-18 22:25:49 +00:00
BKE_customdata.h
Merged
2009-09-18 22:25:49 +00:00
BKE_deform.h
Merge from trunk 16122-16307
2008-08-30 14:32:16 +00:00
BKE_depsgraph.h
Merged
2009-09-18 22:25:49 +00:00
BKE_DerivedMesh.h
Merged
2009-09-18 22:25:49 +00:00
BKE_displist.h
Merged
2009-09-18 22:25:49 +00:00
BKE_effect.h
Merged
2009-09-18 22:25:49 +00:00
BKE_endian.h
Merge from trunk 16122-16307
2008-08-30 14:32:16 +00:00
BKE_exotic.h
Merged
2009-09-18 22:25:49 +00:00
BKE_fcurve.h
Merged
2009-09-18 22:25:49 +00:00
BKE_fluidsim.h
Merged
2009-09-18 22:25:49 +00:00
BKE_font.h
Merged
2009-09-18 22:25:49 +00:00
BKE_global.h
Merged
2009-09-18 22:25:49 +00:00
BKE_gpencil.h
Merged
2009-09-18 22:25:49 +00:00
BKE_group.h
Merged
2009-09-18 22:25:49 +00:00
BKE_icons.h
== imagebrowser ==
2007-09-02 17:25:03 +00:00
BKE_idprop.h
Merged
2009-09-18 22:25:49 +00:00
BKE_image.h
Merged
2009-09-18 22:25:49 +00:00
BKE_ipo.h
Merged
2009-09-18 22:25:49 +00:00
BKE_key.h
Merged
2009-09-18 22:25:49 +00:00
BKE_lattice.h
Merged
2009-09-18 22:25:49 +00:00
BKE_library.h
Merged
2009-09-18 22:25:49 +00:00
BKE_main.h
Merged
2009-09-18 22:25:49 +00:00
BKE_material.h
Merged
2009-09-18 22:25:49 +00:00
BKE_mball.h
Merged
2009-09-18 22:25:49 +00:00
BKE_mesh.h
Merged
2009-09-18 22:25:49 +00:00
BKE_modifier.h
Merged
2009-09-18 22:25:49 +00:00
BKE_multires.h
Merged
2009-09-18 22:25:49 +00:00
BKE_nla.h
Merged
2009-09-18 22:25:49 +00:00
BKE_node.h
Merged
2009-09-18 22:25:49 +00:00
BKE_object.h
Merged
2009-09-18 22:25:49 +00:00
BKE_packedFile.h
Merged
2009-09-18 22:25:49 +00:00
BKE_paint.h
Merged
2009-09-18 22:25:49 +00:00
BKE_particle.h
Merged
2009-09-18 22:25:49 +00:00
BKE_plugin_types.h
This is an expanded patch of this:
2008-04-18 19:10:03 +00:00
BKE_pointcache.h
Merged
2009-09-18 22:25:49 +00:00
BKE_property.h
Merged
2009-09-18 22:25:49 +00:00
BKE_report.h
Merged
2009-09-18 22:25:49 +00:00
BKE_sca.h
Merged
2009-09-18 22:25:49 +00:00
BKE_scene.h
Merged
2009-09-18 22:25:49 +00:00
BKE_screen.h
Merged
2009-09-18 22:25:49 +00:00
BKE_script.h
Patch from GSR that a) fixes a whole bunch of GPL/BL license
2008-04-16 22:40:48 +00:00
BKE_sequence.h
Merged
2009-09-18 22:25:49 +00:00
BKE_shrinkwrap.h
Merged
2009-09-18 22:25:49 +00:00
BKE_simple_deform.h
soc-2008-mxcurioni: FRS_glBlendEquation files
2008-09-28 18:43:51 +00:00
BKE_sketch.h
Merged
2009-09-18 22:25:49 +00:00
BKE_smoke.h
Merged
2009-09-18 22:25:49 +00:00
BKE_softbody.h
Merged
2009-09-18 22:25:49 +00:00
BKE_sound.h
Merged
2009-09-18 22:25:49 +00:00
BKE_subsurf.h
Merged
2009-09-18 22:25:49 +00:00
BKE_suggestions.h
Merged
2009-09-18 22:25:49 +00:00
BKE_text.h
Merged
2009-09-18 22:25:49 +00:00
BKE_texture.h
Merged
2009-09-18 22:25:49 +00:00
BKE_unit.h
Merged
2009-09-18 22:25:49 +00:00
BKE_utildefines.h
Merged
2009-09-18 22:25:49 +00:00
BKE_world.h
Patch from GSR that a) fixes a whole bunch of GPL/BL license
2008-04-16 22:40:48 +00:00
BKE_writeavi.h
Merged
2009-09-18 22:25:49 +00:00
BKE_writeffmpeg.h
Merged
2009-09-18 22:25:49 +00:00
BKE_writeframeserver.h
Merged
2009-09-18 22:25:49 +00:00
CMakeLists.txt
Merged
2009-09-18 22:25:49 +00:00
depsgraph_private.h
Merged
2009-09-18 22:25:49 +00:00
Makefile
Merged
2009-09-18 22:25:49 +00:00
nla_private.h
Merged
2009-09-18 22:25:49 +00:00
SConscript
Merged
2009-09-18 22:25:49 +00:00