Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 Aug 2017 09:14:36 +0000 (11:14 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 Aug 2017 09:14:36 +0000 (11:14 +0200)
1  2 
build_files/build_environment/install_deps.sh
source/blender/blenkernel/intern/library.c

index 4721955af439f4556c6fccba379149b6276fd93b,a1bd410d390eb875495a4e88dd1c5e8c2f57da3d..76b8aa2d446ee2d2170189491751562cc04e4f2b
@@@ -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;