diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-03-13 12:03:26 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-03-28 15:39:54 +0300 |
commit | 6dac874d68bde7ffb72ce44d9916ceeeeb5fb2a1 (patch) | |
tree | d4d63ccbbc09bc052e9aeff5a6e71e0f850fdf1b /source | |
parent | da0d0b2f2091160e9d75015f8931d2bba82c43a0 (diff) |
Fix for various small issues which may cause crashes
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index a9866405827..86454576b98 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -386,7 +386,7 @@ FCurve *rna_get_fcurve_context_ui(bContext *C, PointerRNA *ptr, PropertyRNA *pro } /* if we still haven't found anything, check whether it's a "special" property */ - if ((fcu == NULL) && (adt->nla_tracks.first)) { + if ((fcu == NULL) && (adt && adt->nla_tracks.first)) { NlaTrack *nlt; const char *propname = RNA_property_identifier(prop); diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 68d7cd8c475..5a11b9a2395 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -198,11 +198,11 @@ static void restrictbutton_recursive_child(bContext *C, Scene *scene, Object *ob ID *id; bAction *action; FCurve *fcu; - bool driven; + bool driven, special; RNA_id_pointer_create(&ob->id, &ptr); prop = RNA_struct_find_property(&ptr, rnapropname); - fcu = rna_get_fcurve_context_ui(C, &ptr, prop, 0, NULL, &action, &driven, NULL); + fcu = rna_get_fcurve_context_ui(C, &ptr, prop, 0, NULL, &action, &driven, &special); if (fcu && !driven) { id = ptr.id.data; |