svn merge ^/trunk/blender -r46300:46330
[blender.git] / source / blender / modifiers / intern / MOD_uvproject.c
index 80a3b70d8e32d83fb364d1035e8be5c11b0fec4e..df9a4f2d0171d5e98c62677068a500bf734d508e 100644 (file)
@@ -194,13 +194,13 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
                        
                        cam = (Camera *)projectors[i].ob->data;
                        if (cam->flag & CAM_PANORAMA) {
-                               projectors[i].uci= project_camera_info(projectors[i].ob, NULL, aspx, aspy);
-                               project_camera_info_scale(projectors[i].uci, scax, scay);
+                               projectors[i].uci= BLI_uvproject_camera_info(projectors[i].ob, NULL, aspx, aspy);
+                               BLI_uvproject_camera_info_scale(projectors[i].uci, scax, scay);
                                free_uci= 1;
                        }
                        else {
-                               float sensor= camera_sensor_size(cam->sensor_fit, cam->sensor_x, cam->sensor_y);
-                               int sensor_fit= camera_sensor_fit(cam->sensor_fit, aspx, aspy);
+                               float sensor= BKE_camera_sensor_size(cam->sensor_fit, cam->sensor_x, cam->sensor_y);
+                               int sensor_fit= BKE_camera_sensor_fit(cam->sensor_fit, aspx, aspy);
                                float scale= (cam->type == CAM_PERSP) ? cam->clipsta * sensor / cam->lens : cam->ortho_scale;
                                float xmax, xmin, ymax, ymin;
 
@@ -304,7 +304,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
                                        do {
                                                unsigned int lidx= mp->loopstart + fidx;
                                                unsigned int vidx= mloop[lidx].v;
-                                               project_from_camera(mloop_uv[lidx].uv, coords[vidx], projectors[0].uci);
+                                               BLI_uvproject_from_camera(mloop_uv[lidx].uv, coords[vidx], projectors[0].uci);
                                        } while (fidx--);
                                }
                                else {
@@ -347,7 +347,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd,
                                        do {
                                                unsigned int lidx= mp->loopstart + fidx;
                                                unsigned int vidx= mloop[lidx].v;
-                                               project_from_camera(mloop_uv[lidx].uv, coords[vidx], best_projector->uci);
+                                               BLI_uvproject_from_camera(mloop_uv[lidx].uv, coords[vidx], best_projector->uci);
                                        } while (fidx--);
                                }
                                else {