[Bf-blender-cvs] [a2489e2] master: Code cleanup: style, unused import

[Campbell Barton]

Commit: a2489e29f6233b407c577a7bbf6400a9b160117d
Author: Campbell Barton
Date:   Sun Apr 27 23:57:40 2014 +1000
https://developer.blender.org/rBa2489e29f6233b407c577a7bbf6400a9b160117d

Code cleanup: style, unused import

===================================================================

M	intern/cycles/kernel/geom/geom_curve.h
M	intern/cycles/kernel/shaders/node_fresnel.osl
M	intern/cycles/kernel/shaders/node_glass_bsdf.osl
M	intern/cycles/kernel/shaders/node_refraction_bsdf.osl
M	release/scripts/modules/bpy/ops.py
M	source/blender/editors/space_time/space_time.c

===================================================================

diff --git a/intern/cycles/kernel/geom/geom_curve.h b/intern/cycles/kernel/geom/geom_curve.h
index 32f6a88..d1f8496 100644
--- a/intern/cycles/kernel/geom/geom_curve.h
+++ b/intern/cycles/kernel/geom/geom_curve.h
@@ -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);
diff --git a/intern/cycles/kernel/shaders/node_fresnel.osl b/intern/cycles/kernel/shaders/node_fresnel.osl
index 8c59d5b..7ef553c 100644
--- a/intern/cycles/kernel/shaders/node_fresnel.osl
+++ b/intern/cycles/kernel/shaders/node_fresnel.osl
@@ -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);
 }
diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl
index 9693419..b3d6133 100644
--- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl
@@ -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);
 
diff --git a/intern/cycles/kernel/shaders/node_refraction_bsdf.osl b/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
index f87b3a5..4a32415 100644
--- a/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
@@ -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);
diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py
index 2be2abc..f5455ce 100644
--- a/release/scripts/modules/bpy/ops.py
+++ b/release/scripts/modules/bpy/ops.py
@@ -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,
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 04c1225..7a623f2 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -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);