griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
a5152b7ca0d6d7f340b1955c0e8a15ba23fda336
test2/source/blender/render/intern/include
History
Tamito Kajiyama a5152b7ca0 Merged changes in the trunk up to revision 46787. 
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
2012-05-19 08:40:56 +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
style cleanup: comment blocks
2012-03-09 18:28:30 +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 46309.
2012-05-05 11:40:42 +00:00
rendercore.h
code cleanup: header cleanup
2012-04-30 14:24:11 +00:00
renderdatabase.h
Code Cleanup: remove non existing function declarations.
2012-02-29 15:00:37 +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: remove non existing function declarations.
2012-02-29 15:00:37 +00:00
sss.h
unify include guard defines, __$FILENAME__
2012-02-17 18:59:41 +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: whitespace / commas
2012-04-29 15:47:02 +00:00
texture_ocean.h
Code Cleanup: remove non existing function declarations.
2012-02-29 15:00:37 +00:00
texture.h
code cleanup: color/bw conversion - use BLI color function.
2012-05-09 10:48:24 +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
Code Cleanup: remove non existing function declarations.
2012-02-29 15:00:37 +00:00
zbuf.h
unify include guard defines, __$FILENAME__
2012-02-17 18:59:41 +00:00