diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-18 18:49:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-18 18:49:05 +0400 |
| commit | 52d12852e7a0451de51d56ecd6bc5cd8b97800c3 (patch) | |
| tree | 5c32f66a37cbb5b0d31c65bbcd2ede3a94236d65 /source/blender/makesrna/intern/rna_object.c | |
| parent | b8fc3030b531702b6d1ac8af442e593e4f3ce9fa (diff) | |
| parent | 35ce13562db2eb2dedef76ffdf77b83e48fb684a (diff) | |
svn merge -r38157:38474 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 8dc229920e9..5341c4b8540 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -493,7 +493,7 @@ static PointerRNA rna_Object_active_vertex_group_get(PointerRNA *ptr) static int rna_Object_active_vertex_group_index_get(PointerRNA *ptr) { Object *ob= (Object*)ptr->id.data; - return MAX2(ob->actdef-1, 0); + return ob->actdef-1; } static void rna_Object_active_vertex_group_index_set(PointerRNA *ptr, int value) |