Tamito Kajiyama d546002476 Merged changes in the trunk up to revision 40911. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2011-10-10 21:15:11 +00:00

..

bpy_app_handlers.c

spaces -> tabs (whitespace only changes)

2011-10-06 22:04:01 +00:00

bpy_app_handlers.h

SVN maintenance.

2011-06-24 23:14:26 +00:00

bpy_app.c

own patch [#27752] Python Callback (Scriptlink functionality)

2011-06-24 16:54:30 +00:00

bpy_app.h

mathutils support for color arithmetic, also some minor whitespace edits.

2011-06-02 08:29:16 +00:00

bpy_driver.c

fix [#28807] Drivers breaking by undo

2011-10-05 07:28:59 +00:00

bpy_driver.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_interface_atexit.c

- translation scripts now run with py3.x

2011-09-20 17:07:33 +00:00

bpy_interface.c

2011-09-20 15:17:24 +00:00

bpy_intern_string.c

typo fix: end of lines ;; --> ;

2011-08-31 01:07:55 +00:00

bpy_intern_string.h

SVN maintenance.

2011-06-18 23:22:55 +00:00

bpy_library.c

change BLO_library_append_begin to take a main argument rather then a context, means the BGE doesnt need to make a new empty context just to pass as an arg.

2011-08-05 05:26:19 +00:00

bpy_operator_wrap.c

rename rna OperatorTypeMacro --> OperatorMacro, since operators types are just called Operator

2011-10-05 00:19:33 +00:00

bpy_operator_wrap.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_operator.c

filter RNA classes for translation (removes over 1300 lines from messages.txt)

2011-10-05 03:39:22 +00:00

bpy_operator.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_props.c

spaces -> tabs (whitespace only changes)

2011-10-06 22:04:01 +00:00

bpy_props.h

mathutils support for color arithmetic, also some minor whitespace edits.

2011-06-02 08:29:16 +00:00

bpy_rna_anim.c

edit error macro formatting (confuses some editors)

2011-10-10 07:10:53 +00:00

bpy_rna_anim.h

SVN maintenance.

2011-03-02 05:06:43 +00:00

bpy_rna_array.c

py api

2011-09-27 05:28:06 +00:00

bpy_rna_callback.c

C, style changes (mostly white space edits), no functional change.

2011-03-19 11:12:48 +00:00

bpy_rna_callback.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_rna.c

edit error macro formatting (confuses some editors)

2011-10-10 07:10:53 +00:00

bpy_rna.h

fix for crash generating messages.txt, I wasn't getting this crash because I had 'WITH_PYTHON_SAFETY' enabled which was using different iterators (which dont crash), now there on by default.

2011-09-30 07:47:45 +00:00

bpy_traceback.c

fix for crash when running a python script in a non utf8 blend path, inspecting the exception for the path assumed utf8.

2011-08-26 17:55:03 +00:00

bpy_traceback.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_util.c

IDProperty python module update

2011-06-17 05:45:46 +00:00

bpy_util.h

fix for crash when loading a file from a script, and executing user modules in the newly loaded file.

2011-08-20 13:29:42 +00:00

bpy.c

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

bpy.h

2011-09-20 15:17:24 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 40911.

2011-10-10 21:15:11 +00:00

gpu.c

use replace 0 with NULL for pointers, set some functions static

2011-09-16 08:20:21 +00:00

gpu.h

GPU: add gpu python module with export_shader() function to export GLSL shader.

2011-09-09 11:55:38 +00:00

stubs.c

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00