Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-05-05 10:52:31 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-05-05 10:56:17 +0300
commit52e6a6c5ef79242568c22f9fd27a57a755cf2d4b (patch)
tree25600d654154bbdba0a1d1aa264d9cc70697f4fc /source/blender/blenkernel
parentd2cd27a39d6980860fccecf35f344ec8f1a1caa9 (diff)
MakeLocal: switch back to secure, slightly slower final steps.
Again, Agent327's 04_01_H.lighting.blend shows some problem here, it triggers several times the 'not used at all' assert in step 5 of secure code, and with optimized version we lose the connection between rigs and the main characters! Will keep investigating on this, but for now let's try to give something working to the studio.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/library.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index cde606734f7..3cf9acc237d 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1948,7 +1948,7 @@ void BKE_library_make_local(
/* Note: Keeping both version of the code (old one being safer, since it still has checks against unused IDs)
* for now, we can remove old one once it has been tested for some time in master... */
-#if 1
+#if 0
/* Step 5: proxy 'remapping' hack. */
for (LinkNode *it = copied_ids; it; it = it->next) {
/* Attempt to re-link copied proxy objects. This allows appending of an entire scene