recent merges lost changes in this file, manually merge changes from -r37078:37500
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 10:07:50 +0000 (10:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jul 2011 10:07:50 +0000 (10:07 +0000)
commit3c68357e510bfc6abfbe27dc78e1929a5d209fef
treeda62b39b5e0ffdb083c4fdaf41c5026e560a52a1
parente392ee331979ad366d2a2a507581cb515886840c
recent merges lost changes in this file, manually merge changes from -r37078:37500
source/blender/editors/object/object_modifier.c