test2

intern

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

BKE_action.h

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

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

BKE_anim.h

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

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

BKE_animsys.h

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

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

BKE_armature.h

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

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

BKE_array_mallocn.h

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

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

BKE_blender.h

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

BKE_bmesh.h

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

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

BKE_bmeshCustomData.h

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

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

BKE_bmfont_types.h

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

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

BKE_bmfont.h

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

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

BKE_boids.h

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

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

BKE_booleanops_mesh.h

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

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

BKE_brush.h

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

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

BKE_bullet.h

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

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

BKE_bvhutils.h

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

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

BKE_camera.h

Code refactoring: split camera functions from object.c into new camera.c.

2011-11-05 13:00:39 +00:00

BKE_cdderivedmesh.h

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

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

BKE_cloth.h

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

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

BKE_collision.h

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

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

BKE_colortools.h

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

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

BKE_constraint.h

Bye bye vile relics of extinct version control systems,

2011-08-12 07:20:49 +00:00

BKE_context.h

Camera tracking integration

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

BKE_curve.h

Fix #29005 : Bezier/Surface Datablock switching bug?

2011-11-03 16:16:19 +00:00

BKE_customdata_file.h

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

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

BKE_customdata.h

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

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

BKE_deform.h

correct header, for some reason gcc doesnt warn about this

2011-11-01 09:47:19 +00:00

BKE_depsgraph.h

Depsgraph: add "Dependency Relations" operator to print the dependency graph to

2011-11-04 13:17:35 +00:00

BKE_DerivedMesh.h

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

BKE_displist.h

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

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

BKE_effect.h

more macro --> bli math lib replacements.

2011-11-06 15:39:20 +00:00

BKE_fcurve.h

Cycles: svn merge -r41225:41232 ^/trunk/blender

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

BKE_fluidsim.h

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

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

BKE_font.h

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

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

BKE_global.h

correct spelling mistakes

2011-11-03 03:00:45 +00:00

BKE_gpencil.h

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

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

BKE_group.h

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

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

BKE_icons.h

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

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

BKE_idcode.h

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

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

BKE_idprop.h

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

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

BKE_image.h

use const for readonly strings and set some functions to static

2011-10-27 14:41:26 +00:00

BKE_ipo.h

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

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

BKE_key.h

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

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

BKE_lamp.h

Code refactoring: split lamp functions from object.c into new lamp.c.

2011-11-05 13:11:49 +00:00

BKE_lattice.h

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

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

BKE_library.h

Camera tracking integration

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

BKE_main.h

Camera tracking integration

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

BKE_material.h

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

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

BKE_mball.h

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

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

BKE_mesh.h

move make_uv_vert_map() to bmesh - use MLoopUV's rather than MTFace's.

2011-10-30 09:19:07 +00:00

BKE_modifier.h

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

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

BKE_movieclip.h

Camera tracking integration

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

BKE_multires.h

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

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

BKE_navmesh_conversion.h

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

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

BKE_nla.h

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

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

BKE_node.h

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

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

BKE_object.h

Camera tracking integration

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

BKE_packedFile.h

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

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

BKE_paint.h

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

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

BKE_particle.h

replace macros with bli math functions for particles code

2011-11-06 14:00:55 +00:00

BKE_plugin_types.h

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

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

BKE_pointcache.h

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

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

BKE_property.h

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

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

BKE_report.h

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

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

BKE_sca.h

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

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

BKE_scene.h

Second attempt at getting rid of bsystem_time()

2011-11-06 12:12:14 +00:00

BKE_screen.h

utility function to find the biggest area: BKE_screen_find_big_area(...), was being done with static functions that were copied about.

2011-11-04 01:15:04 +00:00

BKE_script.h

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

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

BKE_sequencer.h

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

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

BKE_shrinkwrap.h

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

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

BKE_sketch.h

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

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

BKE_smoke.h

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

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

BKE_softbody.h

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

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

BKE_sound.h

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

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

BKE_speaker.h

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

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

BKE_subsurf.h

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

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

BKE_suggestions.h

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

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

BKE_tessmesh.h

BMEditMesh.mirror_cdlayer wasnt being set anywhere, adding any other type of layer would break editmesh mirror editing.

2011-10-28 06:23:12 +00:00

BKE_text.h

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

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

BKE_texture.h

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

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

BKE_tracking.h

Camera tracking integration

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

BKE_unit.h

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

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

BKE_utildefines.h

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

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

BKE_world.h

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

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

BKE_writeavi.h

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

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

BKE_writeffmpeg.h

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

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

BKE_writeframeserver.h

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

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

CMakeLists.txt

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

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

depsgraph_private.h

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

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

nla_private.h

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

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

SConscript

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

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