Tamito Kajiyama 065605e0da Merged changes in the trunk up to revision 48893. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

2012-07-13 23:23:06 +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

Cycles: show frame number in render info.

2012-06-04 16:09:51 +00:00

render_opengl.c

style cleanup

2012-07-07 22:51:57 +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

code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.

2012-05-19 13:28:19 +00:00

render_shading.c

Merged changes in the trunk up to revision 47056.

2012-05-26 22:22:45 +00:00

render_update.c

Fix [#31465] Segmentation Fault when Ctrl+Up/Down arrow to restore size of 3d Viewport.

2012-05-15 12:14:03 +00:00

render_view.c

style cleanup: render

2012-03-29 22:42:32 +00:00

SConscript

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00