Merged changes in the trunk up to revision 45133.

Browse Source

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

...

This commit is contained in:

Tamito Kajiyama

2012-03-25 08:20:19 +00:00

parent a2ebfc82db e99a23fc6b

commit 3b711a6ed0

1200 changed files with 77004 additions and 63870 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

547

source/blender/blenloader/intern/writefile.c

File diff suppressed because it is too large Load Diff