Tamito Kajiyama 0ec378f3fe Merged changes in the trunk up to revision 34193. ...

Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h

2011-01-09 15:07:14 +00:00

..

blender

Merged changes in the trunk up to revision 34193.

2011-01-09 15:07:14 +00:00

blenderplayer

stubs.c updates provided by Kupoman.

2011-01-09 02:43:26 +00:00

creator

Merged changes in the trunk up to revision 34193.

2011-01-09 15:07:14 +00:00

darwin

darwin Makefiles: copy release scripts and python modules to where blender looks for them,

2010-10-14 19:30:55 +00:00

gameengine

remove references to BKE_utildefines where its not needed.

2011-01-07 19:18:31 +00:00

icons

…

kernel

rename blenderlib to blender_add_lib

2010-12-22 23:09:30 +00:00

CMakeLists.txt

use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.

2010-12-08 08:43:06 +00:00

Makefile

Reorder library linking.

2010-11-11 06:22:55 +00:00

SConscript

dont build blender/kernel if the game engines disabled.

2010-10-31 00:56:46 +00:00