griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9
test2/source/blender/python/intern
History
Tamito Kajiyama cc3adc2202 Merged changes in the trunk up to revision 43038. 
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2011-12-31 21:09:26 +00:00
..
bpy_app_ffmpeg.c
WIP loading bmesh in trunk, some conversion functions for this purpose.
2011-12-28 13:50:33 +00:00
bpy_app_ffmpeg.h
Add FFmpeg libraries versions to system-info.txt
2011-12-28 12:35:58 +00:00
bpy_app_handlers.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_app_handlers.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_app.c
Add FFmpeg libraries versions to system-info.txt
2011-12-28 12:35:58 +00:00
bpy_app.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_driver.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_driver.h
pydrivers: 'frame' is now in the driver namespace,
2011-11-17 07:08:09 +00:00
bpy_interface_atexit.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_interface.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_intern_string.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_intern_string.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_library.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_operator_wrap.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_operator_wrap.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_operator.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_operator.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_props.c
for bpy.props, when 'name' argument is not initialized, vallback to the attribute name rather than an empty string.
2011-12-28 04:25:46 +00:00
bpy_props.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_rna_anim.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_rna_anim.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_rna_array.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_rna_callback.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_rna_callback.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_rna.c
py - fix for error which made enums not through errors when assigned non string types
2011-12-29 14:46:26 +00:00
bpy_rna.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_traceback.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_traceback.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy_util.c
formatting edits only to use more consisted style
2011-12-26 12:26:11 +00:00
bpy_util.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
bpy.c
Merged changes in the trunk up to revision 42902.
2011-12-27 22:12:46 +00:00
bpy.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
Merged changes in the trunk up to revision 43038.
2011-12-31 21:09:26 +00:00
gpu.c
split some >120 lines, no functional changes
2011-12-21 22:56:06 +00:00
gpu.h
remove header text:
2011-11-29 10:54:47 +00:00
stubs.c
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00