diff options
6 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 3f4b9fbae25..eebff8dfaef 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -302,6 +302,8 @@ static BVHNode *bvh_medianof3(BVHNode **a, int lo, int mid, int hi, int axis) // return a[mid]; } } + +#if 0 /* * Quicksort algorithm modified for Introsort */ @@ -332,7 +334,7 @@ static void sort(BVHNode **a0, int begin, int end, int axis) bvh_insertionsort(a, begin, end, axis); } } -#if 0 + static void sort_along_axis(BVHTree *tree, int start, int end, int axis) { sort(tree->nodes, start, end, axis); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 6717bb2b89c..88c120dc1e1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -106,6 +106,7 @@ #include "BLI_storage_types.h" // for relname flags #include "BKE_animsys.h" +#include "BKE_anim.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_brush.h" diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index e615ae8f140..f3f3853f63b 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -824,7 +824,7 @@ static void console_modal_select_apply(bContext *C, wmOperator *op, wmEvent *eve static void set_cursor_exit(bContext *C, wmOperator *op) { - SpaceConsole *sc= CTX_wm_space_console(C); +// SpaceConsole *sc= CTX_wm_space_console(C); SetConsoleCursor *scu= op->customdata; /* @@ -840,7 +840,7 @@ static void set_cursor_exit(bContext *C, wmOperator *op) static int console_modal_select_invoke(bContext *C, wmOperator *op, wmEvent *event) { SpaceConsole *sc= CTX_wm_space_console(C); - ARegion *ar= CTX_wm_region(C); +// ARegion *ar= CTX_wm_region(C); SetConsoleCursor *scu; op->customdata= MEM_callocN(sizeof(SetConsoleCursor), "SetConsoleCursor"); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index f174e96120c..0f3adae8c20 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -2331,11 +2331,13 @@ void SEQUENCER_OT_view_all_preview(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER; } +#if 0 static EnumPropertyItem view_type_items[] = { {SEQ_VIEW_SEQUENCE, "SEQUENCER", ICON_SEQ_SEQUENCER, "Sequencer", ""}, {SEQ_VIEW_PREVIEW, "PREVIEW", ICON_SEQ_PREVIEW, "Image Preview", ""}, {SEQ_VIEW_SEQUENCE_PREVIEW, "SEQUENCER_PREVIEW", ICON_SEQ_SEQUENCER, "Sequencer and Image Preview", ""}, {0, NULL, 0, NULL, NULL}}; +#endif /* view_all operator */ static int sequencer_view_toggle_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index c999de92ea2..8a9e1077530 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -110,7 +110,7 @@ void draw_motion_path_instance(Scene *scene, View3D *v3d, ARegion *ar, //RegionView3D *rv3d= ar->regiondata; bMotionPathVert *mpv, *mpv_start; int sfra, efra, len; - int i, stepsize; + int i, stepsize= avs->ghost_step; /* get frame ranges */ if (avs->path_type == MOTIONPATH_TYPE_ACFRA) { diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index f251e54ead1..4e9d92e8c17 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1646,7 +1646,6 @@ void view3d_update_depths(ARegion *ar, View3D *v3d) void draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d) { RegionView3D *rv3d= ar->regiondata; - Scene *sce; setwinmatrixview3d(ar, v3d, NULL); /* 0= no pick rect */ setviewmatrixview3d(scene, v3d, rv3d); /* note: calls where_is_object for camera... */ |