svn merge ^/trunk/blender -r50080:50089
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 15:16:53 +0000 (15:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 15:16:53 +0000 (15:16 +0000)
commit498e45d77b4953153c6d10417a7e8a8acce2129d
tree47262c694e75caffe775a784dec3d75601282b6f
parent002b66e06abbd8b4aaaa864f2eaf5ff38b3ba5db
parent3090ae35afe478435a77be6a9c1be913fe406242
svn merge ^/trunk/blender -r50080:50089
source/blender/blenkernel/BKE_colortools.h
source/blender/blenkernel/intern/colortools.c
source/blender/makesrna/intern/rna_color.c