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

Tamito Kajiyama a2ebfc82db Merged changes in the trunk up to revision 44797. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c

2012-03-10 21:56:23 +00:00

..

CMakeLists.txt

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

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

render_intern.h

Merged changes in the trunk up to revision 44221.

2012-02-18 11:26:11 +00:00

render_internal.c

style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).

2012-03-03 16:31:46 +00:00

render_opengl.c

style cleanup: spelling.

2012-03-09 00:41:09 +00:00

render_ops.c

Replaced the changes in revision 41810 with a better implementation

2011-11-20 23:44:50 +00:00

render_preview.c

style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).

2012-03-03 16:31:46 +00:00

render_shading.c

Merged changes in the trunk up to revision 44612.

2012-03-03 01:43:44 +00:00

render_update.c

style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).

2012-03-03 16:31:46 +00:00

render_view.c

style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).

2012-03-03 16:31:46 +00:00

SConscript

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

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