Another merger of Orange branch with bf-blender, it has important fixes.
authorTon Roosendaal <ton@blender.org>
Wed, 14 Dec 2005 20:38:14 +0000 (20:38 +0000)
committerTon Roosendaal <ton@blender.org>
Wed, 14 Dec 2005 20:38:14 +0000 (20:38 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/src/editnla.c
source/blender/src/header_view3d.c

index e2528e349f04693a4362322b284398af315994ba,cb4e7546b53cfeb497311aff24d2b5f9606fbf0a..5dfde4843a04df5f35d071c3a5728633e1b84f35
@@@ -1423,7 -1387,12 +1424,13 @@@ static void lib_link_pose(FileData *fd
                lib_link_constraints(fd, (ID *)ob, &pchan->constraints);
                // hurms... loop in a loop, but yah... later... (ton)
                pchan->bone= get_named_bone(arm, pchan->name);
 +              pchan->custom= newlibadr(fd, arm->id.lib, pchan->custom);
+               if(pchan->bone==NULL)
+                       rebuild= 1;
+       }
+       if(rebuild) {
+               ob->recalc= OB_RECALC;
+               pose->flag |= POSE_RECALC;
        }
  }
  
Simple merge
Simple merge