[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52651] trunk/blender: some minor edits

[Campbell Barton]

Revision: 52651
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52651
Author:   campbellbarton
Date:     2012-11-29 03:55:07 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
some minor edits
- script stub printed resource warning with py3.3 (not closing a file).
- bmesh customdata layer access had bad docstring.
- float/double conversion warnings in sequencer code (use doubles since result is double)
- remove unused var

Modified Paths:
--------------
    trunk/blender/release/scripts/templates/script_stub.py
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types.c

Modified: trunk/blender/release/scripts/templates/script_stub.py
===================================================================
--- trunk/blender/release/scripts/templates/script_stub.py	2012-11-29 03:25:37 UTC (rev 52650)
+++ trunk/blender/release/scripts/templates/script_stub.py	2012-11-29 03:55:07 UTC (rev 52651)
@@ -9,4 +9,6 @@
 
 filepath = os.path.join(os.path.dirname(bpy.data.filepath), filename)
 global_namespace = {"__file__": filepath, "__name__": "__main__"}
-exec(compile(open(filepath).read(), filepath, 'exec'), global_namespace)
+file_handle = open(filepath, 'rb')
+exec(compile(file_handle.read(), filepath, 'exec'), global_namespace)
+file_handle.close()

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-11-29 03:25:37 UTC (rev 52650)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-11-29 03:55:07 UTC (rev 52651)
@@ -1853,11 +1853,11 @@
 			t = *seq->strip->transform;
 		}
 
-		xscale = context.scene->r.xsch ? ((float) context.rectx / (float) context.scene->r.xsch) : 1.0;
-		yscale = context.scene->r.ysch ? ((float) context.recty / (float) context.scene->r.ysch) : 1.0;
+		xscale = context.scene->r.xsch ? ((double)context.rectx / (double)context.scene->r.xsch) : 1.0;
+		yscale = context.scene->r.ysch ? ((double)context.recty / (double)context.scene->r.ysch) : 1.0;
 
-		xscale /= (float) context.rectx / ibuf->x;
-		yscale /= (float) context.recty / ibuf->y;
+		xscale /= (double)context.rectx / (double)ibuf->x;
+		yscale /= (double)context.recty / (double)ibuf->y;
 
 		c.left *= xscale; c.right *= xscale;
 		c.top *= yscale; c.bottom *= yscale;
@@ -2356,7 +2356,7 @@
 	            0 /* (context.scene->r.seq_flag & R_SEQ_GL_REND) */ :
 	            (context.scene->r.seq_flag & R_SEQ_GL_PREV);
 	int do_seq;
-	int have_seq = FALSE;
+	// int have_seq = FALSE;  /* UNUSED */
 	int have_comp = FALSE;
 	Scene *scene;
 	int is_thread_main = BLI_thread_is_main();
@@ -2369,7 +2369,7 @@
 	scene = seq->scene;
 	frame = scene->r.sfra + nr + seq->anim_startofs;
 
-	have_seq = (scene->r.scemode & R_DOSEQ) && scene->ed && scene->ed->seqbase.first;
+	// have_seq = (scene->r.scemode & R_DOSEQ) && scene->ed && scene->ed->seqbase.first;  /* UNUSED */
 	have_comp = (scene->r.scemode & R_DOCOMP) && scene->use_nodes && scene->nodetree;
 
 	oldcfra = scene->r.cfra;

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c	2012-11-29 03:25:37 UTC (rev 52650)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c	2012-11-29 03:55:07 UTC (rev 52651)
@@ -546,7 +546,7 @@
 
 /* note: use for bmvert/edge/face/loop seq's use these, not bmelemseq directly */
 PyDoc_STRVAR(bpy_bmelemseq_layers_doc,
-"blah blah (read-only).\n\n:type: :class:`BMLayerAccess`"
+"custom-data layers (read-only).\n\n:type: :class:`BMLayerAccess`"
 );
 static PyObject *bpy_bmelemseq_layers_get(BPy_BMElemSeq *self, void *htype)
 {