Tamito Kajiyama 63b31ef91b Merged changes in the trunk up to revision 35203. ...

Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c

2011-02-26 20:21:09 +00:00

..

RE_pipeline.h

Merged changes in the trunk up to revision 35203.

2011-02-26 20:21:09 +00:00

RE_render_ext.h

doxygen: entry for gpu, modifiers, nodes, python and render

2011-02-21 06:58:46 +00:00

RE_shader_ext.h

doxygen: entry for gpu, modifiers, nodes, python and render

2011-02-21 06:58:46 +00:00