Campbell Barton 121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

..

action.c

minor edits

2011-11-07 04:36:37 +00:00

anim_sys.c

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

anim.c

svn merge ^/trunk/blender -r41503:41575

2011-11-06 10:38:44 +00:00

armature.c

Bugfix [#29064] armature with curve contraint - crash

2011-11-07 13:25:17 +00:00

blender.c

svn merge ^/trunk/blender -r41503:41575

2011-11-06 10:38:44 +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

replace bmesh specific macros with math functions, also some pedantic formatting edits.

2011-11-07 09:02:10 +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

more macro --> bli math lib replacements.

2011-11-06 15:39: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

minor edits

2011-11-07 04:36:37 +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 -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

camera.c

minor edits

2011-11-07 04:36:37 +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

fix compile errors for previous merge

2011-11-10 03:40:02 +00:00

cloth.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

collision.c

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

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

colortools.c

misc macro --> bli math lib functions

2011-11-06 15:17:43 +00:00

constraint.c

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +00:00

context.c

Camera tracking integration

2011-11-07 12:55:18 +00:00

curve.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

customdata_file.c

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

customdata.c

replace bmesh specific macros with math functions, also some pedantic formatting edits.

2011-11-07 09:02:10 +00:00

deform.c

svn merge -r41422:41431 ^/trunk/blender

2011-11-01 09:05:38 +00:00

depsgraph.c

Revert fix for #29146, needs deeper changes to solve this fully.

2011-11-07 17:07:54 +00:00

DerivedMesh.c

Texturing: texture and 3d view draw type changes, these should only have any

2011-11-08 13:07:16 +00:00

displist.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

editderivedbmesh.c

fix compile errors for previous merge

2011-11-10 03:40:02 +00:00

effect.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

fcurve.c

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

fluidsim.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +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

As discussed on the mailing list, removing the non-functional,

2011-11-06 05:46:45 +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

Camera tracking integration

2011-11-07 12:55:18 +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

added path traversal flag - BPATH_TRAVERSE_SKIP_MULTIFILE,

2011-11-01 06:26:55 +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

World Stars:

2011-11-02 14:28:16 +00:00

key.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

lamp.c

minor edits

2011-11-07 04:36:37 +00:00

lattice.c

minor edits

2011-11-07 04:36:37 +00:00

library.c

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +00:00

material.c

minor edits

2011-11-07 04:36:37 +00:00

mball.c

minor edits

2011-11-07 04:36:37 +00:00

mesh_validate.c

svn merge -r41266:41287 ^/trunk/blender

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

mesh.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +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

use char for BMHeader type and flag (saves 2 bytes per edge/loop/vertex/face)

2011-11-01 14:36:23 +00:00

movieclip.c

Fix a typo in building undistorted proxies for movie clips.

2011-11-08 09:34:43 +00:00

multires.c

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

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

navmesh_conversion.c

bmesh: fixed merge issues with navmesh (though I've not tested if it works yet).

2011-11-08 00:20:50 +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

Texturing: texture and 3d view draw type changes, these should only have any

2011-11-08 13:07:16 +00:00

object.c

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +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 -r41638:41648 ^/trunk/blender

2011-11-10 01:50:22 +00:00

particle.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

pointcache.c

replace VECCOPY with copy_v3_v3, same for 2d copy, also added vec copy functions for int & char.

2011-11-07 01:38:32 +00:00

property.c

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +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

minor edits

2011-11-07 04:36:37 +00:00

screen.c

- added docs and examples for bpy.app.handlers

2011-11-04 04:27:46 +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 po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.

2011-11-05 14:26:18 +00:00

shrinkwrap.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +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 -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

softbody.c

more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.

2011-11-06 16:38:21 +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

minor edits

2011-11-07 04:36:37 +00:00

subsurf_ccg.c

svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs

2011-11-10 03:05:11 +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

minor edits

2011-11-07 04:36:37 +00:00

texture.c

Textures/Shaders: extend TexMapping to include projection options, and add a

2011-11-07 17:35:20 +00:00

tracking.c

quiet warning

2011-11-08 18:23:23 +00:00

unit.c

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

world.c

minor edits

2011-11-07 04:36:37 +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

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +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