[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50110] trunk/blender: fix for blend_render_info.py not closing file & some edits to comments.
Campbell Barton
ideasman42 at gmail.com
Wed Aug 22 12:29:31 CEST 2012
Revision: 50110
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50110
Author: campbellbarton
Date: 2012-08-22 10:29:30 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
fix for blend_render_info.py not closing file & some edits to comments.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/blend_render_info.py
trunk/blender/release/scripts/templates/operator_mesh_add.py
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
Modified: trunk/blender/release/scripts/modules/blend_render_info.py
===================================================================
--- trunk/blender/release/scripts/modules/blend_render_info.py 2012-08-22 10:03:37 UTC (rev 50109)
+++ trunk/blender/release/scripts/modules/blend_render_info.py 2012-08-22 10:29:30 UTC (rev 50110)
@@ -86,6 +86,8 @@
scenes.append((start_frame, end_frame, scene_name))
+ blendfile.close()
+
return scenes
Modified: trunk/blender/release/scripts/templates/operator_mesh_add.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_mesh_add.py 2012-08-22 10:03:37 UTC (rev 50109)
+++ trunk/blender/release/scripts/templates/operator_mesh_add.py 2012-08-22 10:29:30 UTC (rev 50110)
@@ -78,9 +78,9 @@
def execute(self, context):
verts_loc, faces = add_box(self.width,
- self.height,
- self.depth,
- )
+ self.height,
+ self.depth,
+ )
mesh = bpy.data.meshes.new("Box")
Modified: trunk/blender/source/blender/makesdna/DNA_curve_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_curve_types.h 2012-08-22 10:03:37 UTC (rev 50109)
+++ trunk/blender/source/blender/makesdna/DNA_curve_types.h 2012-08-22 10:29:30 UTC (rev 50110)
@@ -87,21 +87,23 @@
short split_tag, dupe_tag;
} BevPoint;
-/* Keyframes on F-Curves (allows code reuse of Bezier eval code) and
+/**
+ * Keyframes on F-Curves (allows code reuse of Bezier eval code) and
* Points on Bezier Curves/Paths are generally BezTriples
+ *
+ * \note alfa location in struct is abused by Key system
+ *
+ * \note vec in BezTriple looks like this:
+ * - vec[0][0] = x location of handle 1
+ * - vec[0][1] = y location of handle 1
+ * - vec[0][2] = z location of handle 1 (not used for FCurve Points(2d))
+ * - vec[1][0] = x location of control point
+ * - vec[1][1] = y location of control point
+ * - vec[1][2] = z location of control point
+ * - vec[2][0] = x location of handle 2
+ * - vec[2][1] = y location of handle 2
+ * - vec[2][2] = z location of handle 2 (not used for FCurve Points(2d))
*/
-/* note: alfa location in struct is abused by Key system */
-/* vec in BezTriple looks like this:
- * - vec[0][0]=x location of handle 1
- * - vec[0][1]=y location of handle 1
- * - vec[0][2]=z location of handle 1 (not used for FCurve Points(2d))
- * - vec[1][0]=x location of control point
- * - vec[1][1]=y location of control point
- * - vec[1][2]=z location of control point
- * - vec[2][0]=x location of handle 2
- * - vec[2][1]=y location of handle 2
- * - vec[2][2]=z location of handle 2 (not used for FCurve Points(2d))
- */
typedef struct BezTriple {
float vec[3][3];
float alfa, weight, radius; /* alfa: tilt in 3D View, weight: used for softbody goal weight, radius: for bevel tapering */
@@ -119,6 +121,10 @@
float radius, pad; /* user-set radius per point for beveling etc */
} BPoint;
+/**
+ * \note Nurb name is misleading, since it can be used for polygons too,
+ * also, it should be NURBS (Nurb isn't the singular of Nurbs).
+ */
typedef struct Nurb {
struct Nurb *next, *prev; /* multiple nurbs per curve object are allowed */
short type;
Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-08-22 10:03:37 UTC (rev 50109)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2012-08-22 10:29:30 UTC (rev 50110)
@@ -102,11 +102,16 @@
StripColorBalance *color_balance;
} Strip;
-/* The sequence structure is the basic struct used by any strip. each of the strips uses a different sequence structure.*/
-/* WATCH IT: first part identical to ID (for use in ipo's)
- * the commend above is historic, probably we can drop the ID compatibility, but take care making this change */
-
-/* WATCH ITv2, this is really a 'Strip' in the UI!, name is highly confusing */
+/**
+ * The sequence structure is the basic struct used by any strip.
+ * each of the strips uses a different sequence structure.
+ *
+ * \warning The first part identical to ID (for use in ipo's)
+ * the commend above is historic, probably we can drop the ID compatibility,
+ * but take care making this change.
+ *
+ * \warning This is really a 'Strip' in the UI!, name is highly confusing.
+ */
typedef struct Sequence {
struct Sequence *next, *prev;
void *tmp; /* tmp var for copying, and tagging for linked selection */
More information about the Bf-blender-cvs
mailing list