Tamito Kajiyama 32c7e22d36 Merged changes in the trunk up to revision 37388. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c

2011-06-11 00:22:10 +00:00

..

freestyle

Fix for the Distance from Object modifier. The problem was

2011-04-12 22:30:18 +00:00

modules

added a check to console auto-compleation for pythons struct_seq type, so bpy.app and sys.float_info autocompleate their attributes rather then bring treated as a typle.

2011-06-10 09:44:27 +00:00

presets

fix [#27196] Traceback caused by preset selection

2011-04-28 09:52:16 +00:00

startup

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

templates

move generic bpy helper modules into bpy_extras.

2011-05-16 07:51:02 +00:00