code cleanup: function naming, use BKE_*type* prefix.

3 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 9e044068468..69ea428b2ba 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -145,7 +145,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		for (base=scene->base.first; base; base=base->next) {
 			if ((base->flag & SELECT) && (base->lay & scene->lay)) {
 				if ((base->object->restrictflag & OB_RESTRICT_VIEW)==0) {
-					if (0==object_is_libdata(base->object)) {
+					if (0==BKE_object_is_libdata(base->object)) {
 						if (selected_editable_objects)
 							CTX_data_id_list_add(result, &base->object->id);
 						else
@@ -242,7 +242,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		}
 	}
 	else if (CTX_data_equals(member, "visible_pose_bones")) {
-		Object *obpose= object_pose_armature_get(obact);
+		Object *obpose= BKE_object_pose_armature_get(obact);
 		bArmature *arm= (obpose) ? obpose->data : NULL;
 		bPoseChannel *pchan;
 		
@@ -258,7 +258,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 		}
 	}
 	else if (CTX_data_equals(member, "selected_pose_bones")) {
-		Object *obpose= object_pose_armature_get(obact);
+		Object *obpose= BKE_object_pose_armature_get(obact);
 		bArmature *arm= (obpose) ? obpose->data : NULL;
 		bPoseChannel *pchan;
 		
@@ -293,7 +293,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 	}
 	else if (CTX_data_equals(member, "active_pose_bone")) {
 		bPoseChannel *pchan;
-		Object *obpose= object_pose_armature_get(obact);
+		Object *obpose= BKE_object_pose_armature_get(obact);
 		
 		pchan= get_active_posechannel(obpose);
 		if (pchan) {
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 512cd404273..e7ad73b3e49 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -419,7 +419,7 @@ bScreen *ED_screen_add(wmWindow *win, Scene *scene, const char *name)
 	bScreen *sc;
 	ScrVert *sv1, *sv2, *sv3, *sv4;
 	
-	sc= alloc_libblock(&G.main->screen, ID_SCR, name);
+	sc= BKE_libblock_alloc(&G.main->screen, ID_SCR, name);
 	sc->scene= scene;
 	sc->do_refresh= 1;
 	sc->redraws_flag= TIME_ALL_3D_WIN|TIME_ALL_ANIM_WIN;
@@ -448,7 +448,7 @@ static void screen_copy(bScreen *to, bScreen *from)
 	ScrArea *sa, *saf;
 	
 	/* free contents of 'to', is from blenkernel screen.c */
-	free_screen(to);
+	BKE_screen_free(to);
 	
 	BLI_duplicatelist(&to->vertbase, &from->vertbase);
 	BLI_duplicatelist(&to->edgebase, &from->edgebase);
@@ -1426,7 +1426,7 @@ void ED_screen_delete(bContext *C, bScreen *sc)
 	ED_screen_set(C, newsc);
 
 	if (delete && win->screen != sc)
-		free_libblock(&bmain->screen, sc);
+		BKE_libblock_free(&bmain->screen, sc);
 }
 
 /* only call outside of area/region loops */
@@ -1654,8 +1654,8 @@ ScrArea *ED_screen_full_toggle(bContext *C, wmWindow *win, ScrArea *sa)
 
 		ED_screen_set(C, sc);
 
-		free_screen(oldscreen);
-		free_libblock(&CTX_data_main(C)->screen, oldscreen);
+		BKE_screen_free(oldscreen);
+		BKE_libblock_free(&CTX_data_main(C)->screen, oldscreen);
 
 	}
 	else {
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 49672b77d43..4395efc23db 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -347,7 +347,7 @@ int ED_operator_posemode(bContext *C)
 
 	if (obact && !(obact->mode & OB_MODE_EDIT)) {
 		Object *obpose;
-		if ((obpose= object_pose_armature_get(obact))) {
+		if ((obpose= BKE_object_pose_armature_get(obact))) {
 			if ((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) {
 				return 1;
 			}