diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-17 19:47:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-17 19:47:00 +0400 |
| commit | 392e1da1790d252f0f156379c1d5507959a4e17a (patch) | |
| tree | 815d4055f1baada104f9843b05cd87b60b5c0fa2 /source/blender/blenlib/intern/uvproject.c | |
| parent | 3afd8d6cc859255d0b52081fbee91b6c6a012b4c (diff) | |
bugfix and cleanup
- BGE Shader.setSampler(name, index): index range check was wrong.
- Compositor check for an invalid channel was incorrect.
- getting the center of selected verts used an uninitalized z axis.
- do_init_render_material() used && rather then & when testing for MA_TRANSP.
- weight paint activate flipped bone used && rather then & for flag checking.
Diffstat (limited to 'source/blender/blenlib/intern/uvproject.c')
| -rw-r--r-- | source/blender/blenlib/intern/uvproject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/uvproject.c b/source/blender/blenlib/intern/uvproject.c index 8cfa083554b..11d93748fe4 100644 --- a/source/blender/blenlib/intern/uvproject.c +++ b/source/blender/blenlib/intern/uvproject.c @@ -136,7 +136,7 @@ UvCameraInfo *project_camera_info(Object *ob, float (*rotmat)[4], float winx, fl uci.do_persp = (camera->type==CAM_PERSP); uci.camangle= lens_to_angle(camera->lens) / 2.0f; - uci.camsize= uci.do_persp ? uci.camsize= tanf(uci.camangle) : camera->ortho_scale; + uci.camsize= uci.do_persp ? tanf(uci.camangle) : camera->ortho_scale; if (invert_m4_m4(uci.caminv, ob->obmat)) { UvCameraInfo *uci_pt; |