diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 14:47:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-01 14:47:46 +0400 |
| commit | 6b693ab7bf0ed7fdc30cdf7cecf85471aa208e59 (patch) | |
| tree | dba745847d17defaba8213f9020bc04a4c6d9630 /source | |
| parent | 176f1aad3dc44d3c7ad0a188fea04beef8980180 (diff) | |
NDOF: add navigation modes to user preferences
also comment debug prints for raytracing
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_ops.c | 7 | ||||
| -rw-r--r-- | source/blender/render/intern/raytrace/svbvh.h | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index f2f4f0f97aa..ca5c7ab739f 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3003,7 +3003,7 @@ static int view3d_center_camera_exec(bContext *C, wmOperator *UNUSED(op)) /* was rv3d->camzoom = BKE_screen_view3d_zoom_from_fac(min_ff(xfac, yfac)); CLAMP(rv3d->camzoom, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX); - WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C)); + WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index f20fda27d37..81a7aba4bfa 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -206,7 +206,7 @@ static int delete_orientation_exec(bContext *C, wmOperator *UNUSED(op)) BIF_removeTransformOrientationIndex(C, selected_index); - WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C)); + WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); WM_event_add_notifier(C, NC_SCENE | NA_EDITED, CTX_data_scene(C)); return OPERATOR_FINISHED; @@ -253,17 +253,18 @@ static int create_orientation_exec(bContext *C, wmOperator *op) const bool use = RNA_boolean_get(op->ptr, "use"); const bool overwrite = RNA_boolean_get(op->ptr, "overwrite"); const bool use_view = RNA_boolean_get(op->ptr, "use_view"); + View3D *v3d = CTX_wm_view3d(C); RNA_string_get(op->ptr, "name", name); - if (use && !CTX_wm_view3d(C)) { + if (use && !v3d) { BKE_report(op->reports, RPT_ERROR, "Create Orientation's 'use' parameter only valid in a 3DView context"); return OPERATOR_CANCELLED; } BIF_createTransformOrientation(C, op->reports, name, use_view, use, overwrite); - WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C)); + WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); WM_event_add_notifier(C, NC_SCENE | NA_EDITED, CTX_data_scene(C)); return OPERATOR_FINISHED; diff --git a/source/blender/render/intern/raytrace/svbvh.h b/source/blender/render/intern/raytrace/svbvh.h index a3ef166e6b2..292b93c445f 100644 --- a/source/blender/render/intern/raytrace/svbvh.h +++ b/source/blender/render/intern/raytrace/svbvh.h @@ -36,7 +36,6 @@ #include "bvh.h" #include "BLI_memarena.h" -#include <stdio.h> #include <algorithm> struct SVBVHNode { @@ -214,7 +213,7 @@ struct Reorganize_SVBVH { ~Reorganize_SVBVH() { -#ifdef DEBUG +#if 0 { printf("%f childs per node\n", childs_per_node / nodes); printf("%d childs BB are useless\n", useless_bb); |