Bugfix #6614:

spurious "can't edit external libdata" for normal operations on proxy armature


Also, fixed two typos in code comments.

4 files changed, 7 insertions, 4 deletions

diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index adc3f1686a4..fa5fe913f5b 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -5446,11 +5446,12 @@ void hookmenu(void)
 }
 
 /*
- * Returns true if teh Object data is a from an external blend file (libdata)
- * */
+ * Returns true if the Object data is a from an external blend file (libdata)
+ */
 int object_data_is_libdata(Object *ob)
 {
 	if (!ob) return 0;
+	if (ob->proxy) return 0;
 	if (ob->id.lib) return 1;
 	if (!ob->data) return 0;
 	if (((ID *)ob->data)->lib) return 1;
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 78ba3fd535b..42ba1a70a55 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -5202,7 +5202,6 @@ void view3d_buttons(void)
 				uiDefIconBut(block, BUT, B_ACTCOPY, ICON_COPYUP, 
 					     xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, 
 					     "Copies the current pose to the buffer");
-				uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
 				uiDefIconBut(block, BUT, B_ACTPASTE, ICON_PASTEUP,	
 					     xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, 
 					     "Pastes the pose from the buffer");
diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c
index f477a578dbd..d51573d6cf8 100644
--- a/source/blender/src/poseobject.c
+++ b/source/blender/src/poseobject.c
@@ -674,6 +674,9 @@ void paste_posebuf (int flip)
 		return;
 	}
 	
+	if(pose_has_protected_selected(ob, 1))
+		return;
+	
 	/* Safely merge all of the channels in this pose into
 	any existing pose */
 	for (chan=g_posebuf->chanbase.first; chan; chan=chan->next){
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index df20b39e159..4cc4c016be1 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -5365,7 +5365,7 @@ static void init_timespace(ScrArea *sa)
 	
 }
 
-/* ******************** SPACE: Time ********************** */
+/* ******************** SPACE: Nodes ********************** */
 
 extern void drawnodespace(ScrArea *sa, void *spacedata);
 extern void winqreadnodespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);