Merging r41564 through r41596 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenloader / intern / readfile.c
index 1dd8f01..3f6cf34 100644 (file)
@@ -4483,7 +4483,7 @@ static void direct_link_object(FileData *fd, Object *ob)
                         * a hook we need to make sure it gets converted
                         * and free'd, regardless of version.
                         */
-               VECCOPY(hmd->cent, hook->cent);
+               copy_v3_v3(hmd->cent, hook->cent);
                hmd->falloff = hook->falloff;
                hmd->force = hook->force;
                hmd->indexar = hook->indexar;
@@ -4610,6 +4610,8 @@ static void lib_link_scene(FileData *fd, Main *main)
                                        marker->camera= newlibadr(fd, sce->id.lib, marker->camera);
                                }
                        }
+#else
+                       (void)marker;
 #endif
 
                        if(sce->ed)
@@ -7295,7 +7297,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                while(ob) {
                        if(ob->transflag & 1) {
                                ob->transflag -= 1;
-                               ob->ipoflag |= OB_OFFS_OB;
+                               //ob->ipoflag |= OB_OFFS_OB;
                        }
                        ob= ob->id.next;
                }
@@ -7326,7 +7328,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                }
                ob= main->object.first;
                while(ob) {
-                       ob->ipoflag |= OB_OFFS_PARENT;
+                       //ob->ipoflag |= OB_OFFS_PARENT;
                        if(ob->dt==0) ob->dt= OB_SOLID;
                        ob= ob->id.next;
                }
@@ -9747,7 +9749,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                part->obfac = paf->obfac;
                                part->randfac = paf->randfac * 25.0f;
                                part->dampfac = paf->damp;
-                               VECCOPY(part->acc, paf->force);
+                               copy_v3_v3(part->acc, paf->force);
 
                                /* flags */
                                if(paf->stype & PAF_VECT) {
@@ -10798,7 +10800,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                tot= MIN2(me->totvert, key->refkey->totelem);
 
                                for(a=0; a<tot; a++, data+=3)
-                                       VECCOPY(me->mvert[a].co, data)
+                                       copy_v3_v3(me->mvert[a].co, data);
                        }
                }
 
@@ -10808,7 +10810,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                tot= MIN2(lt->pntsu*lt->pntsv*lt->pntsw, key->refkey->totelem);
 
                                for(a=0; a<tot; a++, data+=3)
-                                       VECCOPY(lt->def[a].vec, data)
+                                       copy_v3_v3(lt->def[a].vec, data);
                        }
                }
 
@@ -10821,9 +10823,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                                BezTriple *bezt = nu->bezt;
 
                                                for(a=0; a<nu->pntsu; a++, bezt++) {
-                                                       VECCOPY(bezt->vec[0], data); data+=3;
-                                                       VECCOPY(bezt->vec[1], data); data+=3;
-                                                       VECCOPY(bezt->vec[2], data); data+=3;
+                                                       copy_v3_v3(bezt->vec[0], data); data+=3;
+                                                       copy_v3_v3(bezt->vec[1], data); data+=3;
+                                                       copy_v3_v3(bezt->vec[2], data); data+=3;
                                                        bezt->alfa= *data; data++;
                                                }
                                        }
@@ -10831,7 +10833,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                                BPoint *bp = nu->bp;
 
                                                for(a=0; a<nu->pntsu*nu->pntsv; a++, bp++) {
-                                                       VECCOPY(bp->vec, data); data+=3;
+                                                       copy_v3_v3(bp->vec, data); data+=3;
                                                        bp->alfa= *data; data++;
                                                }
                                        }
@@ -13582,7 +13584,7 @@ static void give_base_to_groups(Main *mainvar, Scene *scene)
                        ob->dup_group= group;
                        ob->transflag |= OB_DUPLIGROUP;
                        rename_id(&ob->id, group->id.name+2);
-                       VECCOPY(ob->loc, scene->cursor);
+                       copy_v3_v3(ob->loc, scene->cursor);
                }
        }
 }