Cycles: svn merge -r41531:41613 ^/trunk/blender
[blender.git] / source / blender / blenkernel / intern / texture.c
index 88cf068..c80b288 100644 (file)
@@ -261,7 +261,7 @@ void init_tex_mapping(TexMapping *texmap)
                
                /* translation */
                copy_m4_m3(texmap->mat, mat);
-               VECCOPY(texmap->mat[3], texmap->loc);
+               copy_v3_v3(texmap->mat[3], texmap->loc);
 
                texmap->flag &= ~TEXMAP_UNIT_MATRIX;
        }
@@ -274,7 +274,6 @@ ColorMapping *add_color_mapping(void)
        default_color_mapping(colormap);
        
        return colormap;
-
 }
 
 void default_color_mapping(ColorMapping *colormap)
@@ -814,7 +813,7 @@ Tex *copy_texture(Tex *tex)
 {
        Tex *texn;
        
-       texn= copy_libblock(tex);
+       texn= copy_libblock(&tex->id);
        if(texn->type==TEX_IMAGE) id_us_plus((ID *)texn->ima);
        else texn->ima= NULL;
        
@@ -844,7 +843,7 @@ Tex *localize_texture(Tex *tex)
 {
        Tex *texn;
        
-       texn= copy_libblock(tex);
+       texn= copy_libblock(&tex->id);
        BLI_remlink(&G.main->tex, texn);
        
        /* image texture: free_texture also doesn't decrease */