Tamito Kajiyama 53840c7db5 Merged changes in the trunk up to revision 52546. ...

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c

2012-11-26 02:32:34 +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

code cleanup: use array size and const for vector args

2012-05-26 16:04:31 +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

code cleanup:

2012-10-20 08:02:18 +00:00

render_result.h

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

render_types.h

Merged changes in the trunk up to revision 52118.

2012-11-12 00:30:55 +00:00

rendercore.h

code cleanup:

2012-10-20 08:02:18 +00:00

renderdatabase.h

code cleanup:

2012-10-20 08:02:18 +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

code cleanup: missed some min/max use of float[3], also found case of DO_MIN/MAX re-reading same value from array 4 times when it can do once (use minf rather then MIN2, same for maxf)

2012-05-12 22:34:20 +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

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00