diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/camera.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lamp.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sca.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index ab952fb87ca..aee8ede4062 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -227,7 +227,7 @@ void BKE_camera_params_from_object(CameraParams *params, Object *ob) else if (ob->type == OB_LAMP) { /* lamp object */ Lamp *la = ob->data; - float fac = cosf((float)M_PI * la->spotsize / 360.0f); + float fac = cosf(la->spotsize * 0.5f); float phi = acos(fac); params->lens = 16.0f * fac / sinf(phi); diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 2bd521ab044..904dbec24a4 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -63,7 +63,7 @@ Lamp *BKE_lamp_add(Main *bmain, const char *name) la->r = la->g = la->b = la->k = 1.0f; la->haint = la->energy = 1.0f; la->dist = 25.0f; - la->spotsize = 45.0f; + la->spotsize = DEG2RADF(45.0f); la->spotblend = 0.15f; la->att2 = 1.0f; la->mode = LA_SHAD_BUF; diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index 7c374fd5d78..b0b64cac802 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -44,6 +44,7 @@ #include "DNA_object_types.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_library.h" @@ -405,8 +406,8 @@ void init_actuator(bActuator *act) sa->sound3D.rolloff_factor = 1.0f; sa->sound3D.reference_distance = 1.0f; sa->sound3D.max_gain = 1.0f; - sa->sound3D.cone_inner_angle = 360.0f; - sa->sound3D.cone_outer_angle = 360.0f; + sa->sound3D.cone_inner_angle = DEG2RADF(360.0f); + sa->sound3D.cone_outer_angle = DEG2RADF(360.0f); sa->sound3D.max_distance = FLT_MAX; break; case ACT_OBJECT: diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 7b3f18c1bd4..1507e1742cd 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1246,8 +1246,8 @@ typedef struct WipeZone { static void precalc_wipe_zone(WipeZone *wipezone, WipeVars *wipe, int xo, int yo) { - wipezone->flip = (wipe->angle < 0); - wipezone->angle = tanf(DEG2RADF(fabsf(wipe->angle))); + wipezone->flip = (wipe->angle < 0.0f); + wipezone->angle = tanf(fabsf(wipe->angle)); wipezone->xo = xo; wipezone->yo = yo; wipezone->width = (int)(wipe->edgeWidth * ((xo + yo) / 2.0f)); |