found some changes were missed from previous manual merge
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 11:34:09 +0000 (11:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 11:34:09 +0000 (11:34 +0000)
commitf0b0679fd2cf78a3d137aad0b5732a41c761e1f8
treef93236eea78b1378117c28d805e31af2f4738e58
parent9e134507a78a1bf467e6157b26a282cc67ce27dd
found some changes were missed from previous manual merge
source/blender/blenkernel/intern/displist.c
source/blender/editors/object/object_modifier.c
source/blender/editors/util/ed_util.c