Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c

2013-01-12 02:02:53 +00:00

..

blender-org

fix [#28151] export OBJ don't save the extension

2011-08-03 05:32:07 +00:00

epy

hide overly picky warnings from 'pylint' for pep8 script, indentation edits.

2011-11-19 16:17:35 +00:00

examples

Added some python API examples for the new get/set callbacks in bpy.props.

2013-01-05 15:50:51 +00:00

rst

BGE: Adding a jumpCount to KX_CharacterWrapper. This can be used to have different logic for a single jump versus a double jump. For example, a different animation for the second jump.

2012-12-29 10:22:19 +00:00

rst_from_bmesh_opdefines.py

include an example in the api docs for using bmesh operators to make 2 links in a chain.

2012-11-28 15:08:45 +00:00

sphinx_changelog_gen.py

api changelog for 2.64 and 2.63 (which I missed last release)

2012-10-09 01:07:08 +00:00

sphinx_doc_gen.py

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

sphinx_doc_gen.sh

minor fixes

2012-06-11 12:13:41 +00:00