Commit: 8c4ccab5fecad4be8603d9b2bfe325b485ca7075
Author: Bastien Montagne
Date:   Thu Aug 10 11:14:36 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB8c4ccab5fecad4be8603d9b2bfe325b485ca7075

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/library.c
index 4721955af43,a1bd410d390..76b8aa2d446
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@@ -1150,9 -1127,12 +1148,12 @@@ void *BKE_libblock_alloc(Main *bmain, s
  
                        /* TODO to be removed from here! */
                        if ((flag & LIB_ID_CREATE_NO_DEG_TAG) == 0) {
 -                              DAG_id_type_tag(bmain, type);
 +                              DEG_id_type_tag(bmain, type);
                        }
                }
+               else {
+                       BLI_strncpy(id->name + 2, name, sizeof(id->name) - 2);
+               }
        }
  
        return id;

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

Reply via email to