Merge branch 'blender2.7'
[blender.git] / source / blender / editors / space_text / text_ops.c
index c2f3be0d881422c30a40dc24675174b47618eefa..2bf1dff63c154b1cdb01a6af727e2ef7f7a21943 100644 (file)
@@ -84,7 +84,7 @@ static bool text_edit_poll(bContext *C)
                return 0;
 
        if (ID_IS_LINKED(text)) {
-               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
+               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data");
                return 0;
        }
 
@@ -100,7 +100,7 @@ bool text_space_edit_poll(bContext *C)
                return 0;
 
        if (ID_IS_LINKED(text)) {
-               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
+               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data");
                return 0;
        }
 
@@ -120,7 +120,7 @@ static bool text_region_edit_poll(bContext *C)
                return 0;
 
        if (ID_IS_LINKED(text)) {
-               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata");
+               // BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data");
                return 0;
        }
 
@@ -665,7 +665,7 @@ static int text_refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUS
        short update;
 
        /* check all pyconstraints */
-       for (ob = CTX_data_main(C)->object.first; ob; ob = ob->id.next) {
+       for (ob = CTX_data_main(C)->objects.first; ob; ob = ob->id.next) {
                update = 0;
                if (ob->type == OB_ARMATURE && ob->pose) {
                        bPoseChannel *pchan;
@@ -3041,7 +3041,7 @@ static int text_find_and_replace(bContext *C, wmOperator *op, short mode)
                if (text->id.next)
                        text = st->text = text->id.next;
                else
-                       text = st->text = bmain->text.first;
+                       text = st->text = bmain->texts.first;
                txt_move_toline(text, 0, 0);
                text_update_cursor_moved(C);
                WM_event_add_notifier(C, NC_TEXT | ND_CURSOR, text);