diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-10-14 22:48:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-14 22:48:19 +0400 |
commit | f579fe5681873749077b39a67f79ba6f7544d784 (patch) | |
tree | 607ce786d872840f1cb9da861457a09f21dad379 /source/blender | |
parent | 58cabaa1e32ab52ff35cc996497e6f9a415b3078 (diff) |
fixes for warnings and crashes during doc generation
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 5 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index bbfe077c15e..d5cc31d918a 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -441,7 +441,7 @@ static void *ctx_data_pointer_get(const bContext *C, const char *member) { 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; diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 271964bb483..e69e2cd0e2c 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -53,6 +53,8 @@ EnumPropertyItem fmodifier_type_items[] = { #ifdef RNA_RUNTIME +#include "WM_api.h" + static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr) { FModifier *fcm= (FModifier *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 8dd751cd26a..fbb24f9ada9 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -383,14 +383,13 @@ static void rna_Property_description_get(PointerRNA *ptr, char *value) { 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) diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index aeb82e5640b..722b686218b 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -64,10 +64,12 @@ static void rna_userdef_lmb_select_set(PointerRNA *ptr,int value) 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) { |