[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34291] trunk/blender: fix for NULL missing pointer check, reported on IRC by admix.
Campbell Barton
ideasman42 at gmail.com
Thu Jan 13 06:05:12 CET 2011
Revision: 34291
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34291
Author: campbellbarton
Date: 2011-01-13 05:05:10 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
fix for NULL missing pointer check, reported on IRC by admix.
also rename BVH class for consistency.
Modified Paths:
--------------
trunk/blender/release/scripts/op/io_anim_bvh/__init__.py
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
Modified: trunk/blender/release/scripts/op/io_anim_bvh/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_anim_bvh/__init__.py 2011-01-13 04:53:55 UTC (rev 34290)
+++ trunk/blender/release/scripts/op/io_anim_bvh/__init__.py 2011-01-13 05:05:10 UTC (rev 34291)
@@ -30,7 +30,7 @@
from io_utils import ImportHelper, ExportHelper
-class BvhImporter(bpy.types.Operator, ImportHelper):
+class ImportBVH(bpy.types.Operator, ImportHelper):
'''Load a BVH motion capture file'''
bl_idname = "import_anim.bvh"
bl_label = "Import BVH"
@@ -68,7 +68,7 @@
return import_bvh.load(self, context, **self.as_keywords(ignore=("filter_glob",)))
-class BvhExporter(bpy.types.Operator, ExportHelper):
+class ExportBVH(bpy.types.Operator, ExportHelper):
'''Save a BVH motion capture file from an armature'''
bl_idname = "export_anim.bvh"
bl_label = "Export BVH"
@@ -101,11 +101,11 @@
def menu_func_import(self, context):
- self.layout.operator(BvhImporter.bl_idname, text="Motion Capture (.bvh)")
+ self.layout.operator(ImportBVH.bl_idname, text="Motion Capture (.bvh)")
def menu_func_export(self, context):
- self.layout.operator(BvhExporter.bl_idname, text="Motion Capture (.bvh)")
+ self.layout.operator(ExportBVH.bl_idname, text="Motion Capture (.bvh)")
def register():
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-01-13 04:53:55 UTC (rev 34290)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-01-13 05:05:10 UTC (rev 34291)
@@ -543,9 +543,9 @@
{
bGPdata *gpd= gpencil_data_get_active(C);
ScrArea *sa= CTX_wm_area(C);
-
+
/* only if there's valid data, and the current view is 3D View */
- return ((sa->spacetype == SPACE_VIEW3D) && gpencil_layer_getactive(gpd));
+ return ((sa && sa->spacetype == SPACE_VIEW3D) && gpencil_layer_getactive(gpd));
}
static int gp_convert_layer_exec (bContext *C, wmOperator *op)
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2011-01-13 04:53:55 UTC (rev 34290)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2011-01-13 05:05:10 UTC (rev 34291)
@@ -1135,7 +1135,7 @@
//PropertyRNA *prop;
FunctionRNA *func;
- PropertyRNA *parm;
+ //PropertyRNA *parm;
RNA_def_property_srna(cprop, "SplineBezierPoints");
srna= RNA_def_struct(brna, "SplineBezierPoints", NULL);
More information about the Bf-blender-cvs
mailing list