[Bf-blender-cvs] [64fff35c2ed] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonioya]

Commit: 64fff35c2ed5139a6dedbaefd2b1dde7e49be455
Author: Antonioya
Date:   Mon Jul 30 20:18:06 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB64fff35c2ed5139a6dedbaefd2b1dde7e49be455

Merge branch 'blender2.8' into greasepencil-object

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/material.c
index d5c1e65d90c,28d75811185..03ec26c07d0
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@@ -998,10 -924,10 +998,10 @@@ bool BKE_object_material_slot_remove(Ma
        }
  
        /* check indices from mesh */
 -      if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT)) {
 +      if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_GPENCIL)) {
                material_data_index_remove_id((ID *)ob->data, actcol - 1);
-               if (ob->curve_cache) {
-                       BKE_displist_free(&ob->curve_cache->disp);
+               if (ob->runtime.curve_cache) {
+                       BKE_displist_free(&ob->runtime.curve_cache->disp);
                }
        }
  
diff --cc source/blender/blenkernel/intern/object.c
index 6b0e7b58cce,21b5bb89f19..c88de006eba
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -1232,9 -1153,10 +1232,12 @@@ void BKE_object_transform_copy(Object *
  void BKE_object_copy_data(Main *bmain, Object *ob_dst, const Object *ob_src, 
const int flag)
  {
        ModifierData *md;
 +      GpencilModifierData *gmd;
 +      ShaderFxData *fx;
  
+       /* Do not copy runtime data. */
+       BKE_object_runtime_reset(ob_dst);
+ 
        /* We never handle usercount here for own data. */
        const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs