Commit: b5dfb62a2c8cec5c28d3a532fc5332d4c0c77bdc
Author: Antonio Vazquez
Date: Fri Jul 6 09:30:22 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb5dfb62a2c8cec5c28d3a532fc5332d4c0c77bdc
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/makesrna/intern/rna_gpencil.c
===================================================================
===================================================================
diff --cc source/blender/draw/modes/object_mode.c
index ef5d15c67e7,1e77631fbf0..e946989441c
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@@ -2236,37 -2220,19 +2235,22 @@@ static void OBJECT_cache_populate(void
break;
}
case OB_LAMP:
- if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_LAMP) == 0)
- {
- DRW_shgroup_lamp(stl, ob, view_layer);
- }
+ DRW_shgroup_lamp(stl, ob, view_layer);
break;
case OB_CAMERA:
- if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_CAMERA) == 0)
- {
- DRW_shgroup_camera(stl, ob, view_layer);
- }
+ DRW_shgroup_camera(stl, ob, view_layer);
break;
case OB_EMPTY:
- if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_EMPTY) == 0)
- {
- DRW_shgroup_empty(stl, psl, ob, view_layer);
- }
+ DRW_shgroup_empty(stl, psl, ob, view_layer);
break;
+ case OB_GPENCIL:
+ DRW_shgroup_gpencil(stl, ob, view_layer);
+ break;
case OB_SPEAKER:
- if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_SPEAKER) == 0)
- {
- DRW_shgroup_speaker(stl, ob, view_layer);
- }
+ DRW_shgroup_speaker(stl, ob, view_layer);
break;
case OB_LIGHTPROBE:
- if ((v3d->overlay.hidden_object_types &
V3D_OVERLAY_HIDE_LIGHTPROBE) == 0)
- {
- DRW_shgroup_lightprobe(stl, psl, ob,
view_layer);
- }
+ DRW_shgroup_lightprobe(stl, psl, ob, view_layer);
break;
case OB_ARMATURE:
{
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
