Commit: efc08aa60031034d79492ffe4252d97814935768
Author: Antonio Vazquez
Date: Thu Jul 5 19:39:42 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBefc08aa60031034d79492ffe4252d97814935768
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/draw/modes/object_mode.c
index 969efb0f87a,0a45dd7f123..ef5d15c67e7
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@@ -2232,22 -2221,34 +2236,37 @@@ static void OBJECT_cache_populate(void
break;
}
case OB_LAMP:
- DRW_shgroup_lamp(stl, ob, view_layer);
+ if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_LAMP) == 0)
+ {
+ DRW_shgroup_lamp(stl, ob, view_layer);
+ }
break;
case OB_CAMERA:
- DRW_shgroup_camera(stl, ob, view_layer);
+ if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_CAMERA) == 0)
+ {
+ DRW_shgroup_camera(stl, ob, view_layer);
+ }
break;
case OB_EMPTY:
- DRW_shgroup_empty(stl, psl, ob, view_layer);
+ if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_EMPTY) == 0)
+ {
+ DRW_shgroup_empty(stl, psl, ob, view_layer);
+ }
break;
+ case OB_GPENCIL:
+ DRW_shgroup_gpencil(stl, ob, view_layer);
+ break;
case OB_SPEAKER:
- DRW_shgroup_speaker(stl, ob, view_layer);
+ if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_SPEAKER) == 0)
+ {
+ DRW_shgroup_speaker(stl, ob, view_layer);
+ }
break;
case OB_LIGHTPROBE:
- DRW_shgroup_lightprobe(stl, psl, ob, view_layer);
+ if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_LIGHTPROBE) == 0)
+ {
+ DRW_shgroup_lightprobe(stl, psl, ob,
view_layer);
+ }
break;
case OB_ARMATURE:
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
