Tamito Kajiyama feccbaabbd Merged changes in the trunk up to revision 53584. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup

2013-01-05 22:24:05 +00:00

..

envmap.h

code cleanup: use float sizes for function args.

2012-10-15 23:11:59 +00:00

gammaCorrectionTables.h

code cleanup: header cleanup

2012-04-30 14:24:11 +00:00

initrender.h

fix for re->partx/re->party values being different for RE_Database_FromScene() then the main render loop.

2012-11-21 10:20:38 +00:00

occlusion.h

code cleanup: header cleanup

2012-04-30 14:24:11 +00:00

pixelblending.h

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00

pixelshading.h

fix for building on msvc2008 (also style cleanup)

2012-09-04 01:23:50 +00:00

pointdensity.h

code cleanup: use float sizes for function args.

2012-10-15 23:11:59 +00:00

raycounter.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

rayintersection.h

style cleanup: comment blocks

2012-03-09 18:28:30 +00:00

rayobject.h

Ambient occlusion baker from multi-resolution mesh

2012-12-18 17:46:42 +00:00

render_result.h

Alpha premul pipeline cleanup

2012-12-31 13:52:13 +00:00

render_types.h

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

rendercore.h

Multires baker: made octree aware of user-defined resolution in performance panel

2012-12-18 17:46:54 +00:00

renderdatabase.h

Patch [#29035] Vertex colour baking

2013-01-02 00:05:30 +00:00

renderpipeline.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

shadbuf.h

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

shading.h

code cleanup: use float sizes for function args.

2012-10-15 23:11:59 +00:00

sss.h

code cleanup: use array size and const for vector args

2012-05-26 16:04:31 +00:00

strand.h

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00

sunsky.h

style cleanup

2012-10-27 01:46:47 +00:00

texture_ocean.h

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

texture.h

fix writing past array bounds in imagewraposa().

2012-10-06 12:04:09 +00:00

volume_precache.h

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

volumetric.h

code cleanup: remove deprecated defines and some struct members

2012-09-06 00:33:59 +00:00

voxeldata.h

style cleanup

2012-06-06 22:38:39 +00:00

zbuf.h

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00