[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23845] trunk/blender/source/blender: fixes for warnings and crashes during doc generation
Campbell Barton
ideasman42 at gmail.com
Wed Oct 14 20:48:19 CEST 2009
Revision: 23845
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23845
Author: campbellbarton
Date: 2009-10-14 20:48:19 +0200 (Wed, 14 Oct 2009)
Log Message:
-----------
fixes for warnings and crashes during doc generation
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c 2009-10-14 16:23:23 UTC (rev 23844)
+++ trunk/blender/source/blender/blenkernel/intern/context.c 2009-10-14 18:48:19 UTC (rev 23845)
@@ -441,7 +441,7 @@
{
bContextDataResult result;
- if(ctx_data_get((bContext*)C, member, &result))
+ if(C && ctx_data_get((bContext*)C, member, &result))
return result.ptr.data;
return NULL;
Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c 2009-10-14 16:23:23 UTC (rev 23844)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c 2009-10-14 18:48:19 UTC (rev 23845)
@@ -53,6 +53,8 @@
#ifdef RNA_RUNTIME
+#include "WM_api.h"
+
static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
{
FModifier *fcm= (FModifier *)ptr->data;
Modified: trunk/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_rna.c 2009-10-14 16:23:23 UTC (rev 23844)
+++ trunk/blender/source/blender/makesrna/intern/rna_rna.c 2009-10-14 18:48:19 UTC (rev 23845)
@@ -383,14 +383,13 @@
{
PropertyRNA *prop= (PropertyRNA*)ptr->data;
rna_idproperty_check(&prop, ptr);
- strcpy(value, prop->description);
+ strcpy(value, prop->description ? prop->description:"");
}
-
static int rna_Property_description_length(PointerRNA *ptr)
{
PropertyRNA *prop= (PropertyRNA*)ptr->data;
rna_idproperty_check(&prop, ptr);
- return strlen(prop->description);
+ return prop->description ? strlen(prop->description) : 0;
}
static int rna_Property_type_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2009-10-14 16:23:23 UTC (rev 23844)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2009-10-14 18:48:19 UTC (rev 23845)
@@ -64,10 +64,12 @@
userdef->flag &= ~USER_LMOUSESELECT;
}
+#if 0
static void rna_userdef_rmb_select_set(PointerRNA *ptr,int value)
{
rna_userdef_lmb_select_set(ptr, !value);
}
+#endif
static void rna_userdef_emulate_set(PointerRNA *ptr,int value)
{
More information about the Bf-blender-cvs
mailing list