Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ...

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

2012-06-10 20:50:43 +00:00

..

envmap.h

unify include guard defines, __$FILENAME__

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

gammaCorrectionTables.h

code cleanup: header cleanup

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

initrender.h

code cleanup: header cleanup

2012-04-30 14:24:11 +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

style cleanup: comment blocks

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

pointdensity.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +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

- simplify rip code not to expand/contract selection.

2012-03-07 00:08:00 +00:00

render_result.h

unify include guard defines, __$FILENAME__

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

render_types.h

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +00:00

rendercore.h

style cleanup

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

renderdatabase.h

code cleanup: use const float and define array size

2012-05-26 22:21:56 +00:00

renderpipeline.h

unify include guard defines, __$FILENAME__

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

shadbuf.h

code cleanup: header cleanup

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

shading.h

code cleanup: use array size and const for vector args

2012-05-26 16:04:31 +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-06-06 22:38:39 +00:00

texture_ocean.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00

texture.h

code cleanup: use array size and const for vector args

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

volume_precache.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

volumetric.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

voxeldata.h

style cleanup

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

zbuf.h

style cleanup

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