diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-28 10:37:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-28 10:37:58 +0400 |
| commit | c4a50e9aeb589045b857fea878fb86faba39dd3c (patch) | |
| tree | 650846ab417fc96c646da2bed9b8edd16e2a8147 /source/blender/editors | |
| parent | 0cb9a8311364edbc65fa207678341b88b986749d (diff) | |
remove unneeded NULL checks, add one for give_matarar() return value.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/armature/pose_utils.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index a5e51ccf32a..014a64170db 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -239,7 +239,7 @@ void poseAnim_mapping_autoKeyframe(bContext *C, Scene *scene, Object *ob, ListBa * - only do this if keyframes should have been added * - do not calculate unless there are paths already to update... */ - if (C && (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS)) { + if (ob->pose->avs.path_bakeflag & MOTIONPATH_BAKE_HAS_PATHS) { //ED_pose_clear_paths(C, ob); // XXX for now, don't need to clear ED_pose_recalculate_paths(scene, ob); } diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 13fb46e35de..52f51cfcf48 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2049,7 +2049,7 @@ static int make_local_exec(bContext *C, wmOperator *op) if (adt) BKE_animdata_make_local(adt); /* tag indirect data direct */ - matarar = (Material ***)give_matarar(ob); + matarar = give_matarar(ob); if (matarar) { for (a = 0; a < ob->totcol; a++) { ma = (*matarar)[a]; diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index c4315c56376..59e3180172d 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -148,15 +148,16 @@ static void graph_panel_properties(const bContext *C, Panel *pa) PointerRNA fcu_ptr; uiLayout *layout = pa->layout; uiLayout *col, *row, *sub; - uiBlock *block; + // uiBlock *block; // UNUSED char name[256]; int icon = 0; if (!graph_panel_context(C, &ale, &fcu)) return; - block = uiLayoutGetBlock(layout); - /* uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL); */ + // UNUSED + // block = uiLayoutGetBlock(layout); + // uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL); /* F-Curve pointer */ RNA_pointer_create(ale->id, &RNA_FCurve, fcu, &fcu_ptr); |