diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-09 14:51:29 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-09 14:51:29 +0300 |
| commit | 568c8b7b5541da481b923ced73746590887baa6f (patch) | |
| tree | 743da22bacb9887e8736ec5203f4816a98fc47a6 /source/blender/editors/space_view3d | |
| parent | 6148295f1ab3a9a68e92878a9fcbef7af33be96a (diff) | |
| parent | 2f16098d208058dce7701d6e49ed9052445553f5 (diff) | |
Merge branch 'master' into viewport_experiments
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_buttons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 42b7f62c8d1..88f43ab340f 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -846,7 +846,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa) vgroup_validmap = BKE_object_defgroup_subset_from_select_type(ob, subset_type, &vgroup_tot, &subset_count); for (i = 0, dg = ob->defbase.first; dg; i++, dg = dg->next) { - bool locked = dg->flag & DG_LOCK_WEIGHT; + bool locked = (dg->flag & DG_LOCK_WEIGHT) != 0; if (vgroup_validmap[i]) { MDeformWeight *dw = defvert_find_index(dv, i); if (dw) { |