projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dde68ec
e64008e
)
Another merger of Orange branch with bf-blender, it has important fixes.
author
Ton Roosendaal <ton@blender.org>
Wed, 14 Dec 2005 20:38:14 +0000
(20:38 +0000)
committer
Ton Roosendaal <ton@blender.org>
Wed, 14 Dec 2005 20:38:14 +0000
(20:38 +0000)
1
2
source/blender/blenloader/intern/readfile.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/src/editnla.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/src/header_view3d.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenloader/intern/readfile.c
index e2528e349f04693a4362322b284398af315994ba,cb4e7546b53cfeb497311aff24d2b5f9606fbf0a..5dfde4843a04df5f35d071c3a5728633e1b84f35
---
1
/
source/blender/blenloader/intern/readfile.c
---
2
/
source/blender/blenloader/intern/readfile.c
+++ b/
source/blender/blenloader/intern/readfile.c
@@@
-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;
}
}
diff --cc
source/blender/src/editnla.c
Simple merge
diff --cc
source/blender/src/header_view3d.c
Simple merge