Campbell Barton 94f8e3198d svn merge -r41266:41287 ^/trunk/blender

2011-10-26 03:26:52 +00:00

..

action.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

anim_sys.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

anim.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

armature.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

blender.c

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

BME_conversions.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

BME_Customdata.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

BME_eulers.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

BME_mesh.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

BME_structure.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

BME_tools.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

bmesh_private.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bmfont.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

boids.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

booleanops_mesh.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

brush.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

bullet.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bvhutils.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

CCGSubSurf.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

CCGSubSurf.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

cdderivedmesh.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

cloth.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

collision.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

colortools.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

constraint.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

context.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

curve.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

customdata_file.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

customdata.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

deform.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

depsgraph.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

DerivedMesh.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

displist.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

editderivedbmesh.c

remove $Id from headers

2011-10-24 23:32:24 +00:00

effect.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

fcurve.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

fluidsim.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

fmodifier.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

font.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

gpencil.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

group.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

icons.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

idcode.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

idprop.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

image_gen.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

image.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

implicit.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

ipo.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

key.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

lattice.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

library.c

svn merge ^/trunk/blender -r41230:41266

2011-10-24 23:06:27 +00:00

material.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

mball.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

mesh_validate.c

svn merge -r41266:41287 ^/trunk/blender

2011-10-26 03:26:52 +00:00

mesh.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

modifier.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

modifiers_bmesh.c

remove $Id from headers

2011-10-24 23:32:24 +00:00

multires.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

navmesh_conversion.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

nla.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

node.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

object.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

packedFile.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

paint.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

particle_system.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

particle.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

pointcache.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

property.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

report.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

sca.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

scene.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

screen.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

script.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

seqcache.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

seqeffects.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

sequencer.c

Remove currently unused IMB_cache_limiter_* function.

2011-10-24 17:26:24 +00:00

shrinkwrap.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

sketch.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

smoke.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

softbody.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

sound.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

speaker.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

subsurf_ccg.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

suggestions.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

text.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

texture.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

unit.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

world.c

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

writeavi.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

writeffmpeg.c

cmake macro to set less strict flags per file - remove_strict_flags_file(file, file...)

2011-10-25 11:06:52 +00:00

writeframeserver.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00