Commit: a3e7590bb8aa0acab8bf22ef0f5e8a9bc5d378b2
Author: Antonio Vazquez
Date: Tue Jul 10 18:05:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa3e7590bb8aa0acab8bf22ef0f5e8a9bc5d378b2
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 93d8120051f,cf2c9641971..1be47549cf9
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3932,9 -3895,9 +3932,10 @@@ class VIEW3D_PT_overlay(Panel)
sub.prop(overlay, "show_relationship_lines")
sub.prop(overlay, "show_motion_paths")
#sub.prop(overlay, "show_onion_skins")
+ sub.prop(context.space_data, "show_annotation", text="Annotations")
sub.prop(overlay, "show_face_orientation")
sub.prop(overlay, "show_backface_culling")
+ sub.prop(overlay, "show_bones", text="Bones")
if shading.type == 'MATERIAL':
sub.prop(overlay, "show_look_dev")
diff --cc source/blender/blenkernel/intern/object.c
index bd0d2ec59b8,14794bd7061..00c0d8e7002
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -465,9 -424,10 +465,11 @@@ void BKE_object_free(Object *ob
{
BKE_animdata_free((ID *)ob, false);
+ DRW_drawdata_free((ID *)ob);
+
/* BKE_<id>_free shall never touch to ID->us. Never ever. */
BKE_object_free_modifiers(ob, LIB_ID_CREATE_NO_USER_REFCOUNT);
+ BKE_object_free_shaderfx(ob, LIB_ID_CREATE_NO_USER_REFCOUNT);
MEM_SAFE_FREE(ob->mat);
MEM_SAFE_FREE(ob->matbits);
@@@ -1309,13 -1205,9 +1304,13 @@@ void BKE_object_copy_data(Main *UNUSED(
ob_dst->derivedFinal = NULL;
BLI_listbase_clear(&ob_dst->gpulamp);
- BLI_listbase_clear(&ob_dst->drawdata);
+ BLI_listbase_clear((ListBase *)&ob_dst->drawdata);
BLI_listbase_clear(&ob_dst->pc_ids);
+ /* grease pencil: clean derived data */
+ if (ob_dst->type == OB_GPENCIL)
+ BKE_gpencil_free_derived_frames(ob_dst->data);
+
ob_dst->avs = ob_src->avs;
ob_dst->mpath = animviz_copy_motionpath(ob_src->mpath);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
