diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-23 14:17:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-23 14:17:30 +0300 |
| commit | d490065ea0e18b49fbd4b5e01d41a6dc819cf62e (patch) | |
| tree | 63ada664cb8fe0b1336e25db254614d205d8b546 /source/blender/makesrna/intern/rna_space.c | |
| parent | bff34848c383b05def4ef0dc4e31043d7020b28e (diff) | |
| parent | 0884c174b3b43cb53b47269cc204f08c0dc68f6a (diff) | |
Merge branch 'master' into depsgraph_refactor
Conflicts:
source/blender/editors/object/object_constraint.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 212bf5f66f3..112c56df54e 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -413,8 +413,8 @@ static void rna_SpaceView3D_lock_camera_and_layers_set(PointerRNA *ptr, int valu /* seek for layact */ bit = 0; while (bit < 32) { - if (v3d->lay & (1 << bit)) { - v3d->layact = 1 << bit; + if (v3d->lay & (1u << bit)) { + v3d->layact = (1u << bit); break; } bit++; @@ -493,8 +493,11 @@ static void rna_SpaceView3D_matcap_enable(Main *UNUSED(bmain), Scene *UNUSED(sce { View3D *v3d = (View3D *)(ptr->data); - if (v3d->matcap_icon == 0) + if (v3d->matcap_icon < ICON_MATCAP_01 || + v3d->matcap_icon > ICON_MATCAP_24) + { v3d->matcap_icon = ICON_MATCAP_01; + } } static void rna_SpaceView3D_pivot_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) |