diff options
-rw-r--r-- | source/blender/blenfont/intern/blf_lang.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/uvproject.c | 19 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_subwindow.c | 1 |
4 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c index 5976a2c98a6..bc2de70222d 100644 --- a/source/blender/blenfont/intern/blf_lang.c +++ b/source/blender/blenfont/intern/blf_lang.c @@ -45,7 +45,6 @@ #include "BLI_linklist.h" /* linknode */ #include "BLI_string.h" -#include "BIF_gl.h" #ifdef __APPLE__ #include "BKE_utildefines.h" diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 8739a9c8b48..7be0cb3e3ed 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -3690,8 +3690,8 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, int num_projectors = 0; float aspect; char uvname[32]; - float aspx= umd->aspectx ? 1.0f : umd->aspectx; - float aspy= umd->aspecty ? 1.0f : umd->aspecty; + float aspx= umd->aspectx ? umd->aspectx : 1.0f; + float aspy= umd->aspecty ? umd->aspecty : 1.0f; int free_uci= 0; aspect = aspx / aspy; diff --git a/source/blender/blenlib/intern/uvproject.c b/source/blender/blenlib/intern/uvproject.c index 273cb01ce1c..0e7c36886ce 100644 --- a/source/blender/blenlib/intern/uvproject.c +++ b/source/blender/blenlib/intern/uvproject.c @@ -56,28 +56,31 @@ void project_from_camera(float target[2], float source[3], UvCameraInfo *uci) if(uci->do_pano) { float angle= atan2f(pv4[0], -pv4[2]) / (M_PI * 2.0); /* angle around the camera */ if (uci->do_persp==0) { - target[0] = angle; /* no correct method here, just map to 0-1 */ - target[1] = pv4[1] / uci->camsize; + target[0]= angle; /* no correct method here, just map to 0-1 */ + target[1]= pv4[1] / uci->camsize; } else { float vec2d[2]= {pv4[0], pv4[2]}; /* 2D position from the camera */ - target[0] = angle * (M_PI / uci->camangle); - target[1] = pv4[1] / (len_v2(vec2d) * uci->camsize); + target[0]= angle * (M_PI / uci->camangle); + target[1]= pv4[1] / (len_v2(vec2d) * uci->camsize); } } else { if (pv4[2]==0.0f) pv4[2]= 0.00001f; /* don't allow div by 0 */ if (uci->do_persp==0) { - target[0]=(pv4[0]/uci->camsize) * uci->xasp; - target[1]=(pv4[1]/uci->camsize) * uci->yasp; + target[0]= (pv4[0]/uci->camsize); + target[1]= (pv4[1]/uci->camsize); } else { - target[0]=(-pv4[0]*((1.0f/uci->camsize)/pv4[2])*uci->xasp) / 2.0f; - target[1]=(-pv4[1]*((1.0f/uci->camsize)/pv4[2])*uci->yasp) / 2.0f; + target[0]= (-pv4[0]*((1.0f/uci->camsize)/pv4[2])) / 2.0f; + target[1]= (-pv4[1]*((1.0f/uci->camsize)/pv4[2])) / 2.0f; } } + target[0] *= uci->xasp; + target[1] *= uci->yasp; + /* adds camera shift + 0.5 */ target[0] += uci->shiftx; target[1] += uci->shifty; diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index 3f7aa0a8f52..f512434a141 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -44,7 +44,6 @@ #include "BKE_global.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "WM_api.h" #include "wm_subwindow.h" |