blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Code cleanup: style, unused import

This commit is contained in:
Campbell Barton 2014-04-27 23:57:40 +10:00
parent d7d2e71a03
commit a2489e29f6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/geom/geom_curve.h
View File

@ -782,10 +782,10 @@ ccl_device_inline bool bvh_curve_intersect(KernelGlobals *kg, Intersection *isec
}
float z = zcentre + (dirz * correction);
bool backface = false;
// bool backface = false;
if(flags & CURVE_KN_BACKFACING && (t < 0.0f || z < 0 || z > l)) {
backface = true;
// backface = true;
correction = ((-tb + rootd)/(2*a));
t = tcentre + correction;
z = zcentre + (dirz * correction);

2
intern/cycles/kernel/shaders/node_fresnel.osl
View File

@ -23,7 +23,7 @@ shader node_fresnel(
output float Fac = 0.0)
{
float f = max(IOR, 1e-5);
float eta = backfacing() ? 1.0 / f: f;
float eta = backfacing() ? 1.0 / f : f;
float cosi = dot(I, Normal);
Fac = fresnel_dielectric_cos(cosi, eta);
}

2
intern/cycles/kernel/shaders/node_glass_bsdf.osl
View File

@ -26,7 +26,7 @@ shader node_glass_bsdf(
output closure color BSDF = 0)
{
float f = max(IOR, 1e-5);
float eta = backfacing() ? 1.0 / f: f;
float eta = backfacing() ? 1.0 / f : f;
float cosi = dot(I, Normal);
float Fr = fresnel_dielectric_cos(cosi, eta);

2
intern/cycles/kernel/shaders/node_refraction_bsdf.osl
View File

@ -25,7 +25,7 @@ shader node_refraction_bsdf(
output closure color BSDF = 0)
{
float f = max(IOR, 1e-5);
float eta = backfacing() ? 1.0 / f: f;
float eta = backfacing() ? 1.0 / f : f;
if (distribution == "Sharp")
BSDF = Color * refraction(Normal, eta);

2
release/scripts/modules/bpy/ops.py
View File

@ -201,7 +201,7 @@ class BPyOpsSubModOp(object):
return op_get_instance(self.idname())
def __repr__(self): # useful display, repr(op)
import bpy
# import bpy
idname = self.idname()
as_string = op_as_string(idname)
# XXX You never quite know what you get from bpy.types,

4
source/blender/editors/space_time/space_time.c
View File

@ -336,7 +336,7 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel)
}
/* draw keyframe lines for timeline */
static void time_draw_keyframes(const bContext *C, SpaceTime *stime, ARegion *ar)
static void time_draw_keyframes(const bContext *C, ARegion *ar)
{
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
@ -516,7 +516,7 @@ static void time_main_area_draw(const bContext *C, ARegion *ar)
UI_view2d_view_ortho(v2d);
/* keyframes */
time_draw_keyframes(C, stime, ar);
time_draw_keyframes(C, ar);
/* markers */
UI_view2d_view_orthoSpecial(ar, v2d, 1);