This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ...

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

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

..

avi

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

blenfont

style cleanup: follow style guide for formatting of if/for/while loops, and else if's

2012-03-24 06:24:53 +00:00

blenkernel

Merged changes in the trunk up to revision 45133.

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

blenlib

Merged changes in the trunk up to revision 45133.

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

blenloader

Merged changes in the trunk up to revision 45133.

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

blenpluginapi

style cleanup: follow style guide for formatting of if/for/while loops, and else if's

2012-03-24 06:38:07 +00:00

bmesh

Merged changes in the trunk up to revision 45133.

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

collada

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

editors

Merged changes in the trunk up to revision 45133.

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

freestyle

Another possible fix for degenerate triangles in imported mesh data.

2012-03-05 19:01:12 +00:00

gpu

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

ikplugin

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

imbuf

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

makesdna

Merged changes in the trunk up to revision 45133.

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

makesrna

Merged changes in the trunk up to revision 45133.

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

modifiers

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

nodes

style cleanup: follow style guide for/with/if spacing

2012-03-24 07:52:14 +00:00

python

Merged changes in the trunk up to revision 45133.

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

quicktime

style cleanup: follow style guide for formatting of if/for/while loops, and else if's

2012-03-24 06:24:53 +00:00

render

Merged changes in the trunk up to revision 45133.

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

windowmanager

Merged changes in the trunk up to revision 45133.

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

CMakeLists.txt

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00

SConscript

Merged changes in the trunk up to revision 44266 (including BMesh).

2012-02-21 01:40:04 +00:00