diff options
| -rw-r--r-- | release/scripts/op/io_anim_bvh/__init__.py | 8 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/op/io_anim_bvh/__init__.py b/release/scripts/op/io_anim_bvh/__init__.py index f9b4d76ab8f..8f918d05a10 100644 --- a/release/scripts/op/io_anim_bvh/__init__.py +++ b/release/scripts/op/io_anim_bvh/__init__.py @@ -30,7 +30,7 @@ from bpy.props import * 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 @@ class BvhImporter(bpy.types.Operator, ImportHelper): 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 @@ class BvhExporter(bpy.types.Operator, ExportHelper): 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(): diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index e7660659dfa..b7f13ebe0b7 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -543,9 +543,9 @@ static int gp_convert_poll (bContext *C) { 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) diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 8ffd98b8d88..7656e543440 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1135,7 +1135,7 @@ static void rna_def_curve_spline_bezpoints(BlenderRNA *brna, PropertyRNA *cprop) //PropertyRNA *prop; FunctionRNA *func; - PropertyRNA *parm; + //PropertyRNA *parm; RNA_def_property_srna(cprop, "SplineBezierPoints"); srna= RNA_def_struct(brna, "SplineBezierPoints", NULL); |