misc small edits syncing with trunk
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 13:59:11 +0000 (13:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 13:59:11 +0000 (13:59 +0000)
commit385c38f6ed13b3d9502644f6912517ea4314630e
treed7f94234e990ef04d0ec5aaebe53fa78c17551af
parentc93be80be9f27edffaa848eb147e5b09dceec1c3
misc small edits syncing with trunk
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/imbuf/IMB_imbuf.h
source/blender/makesrna/intern/rna_nodetree_types.h