diff options
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 18 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 18 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index eb245ae0766..13c5bddd3bf 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -471,7 +471,7 @@ static bool view3d_drop_id_in_main_region_poll(bContext *C, static bool view3d_ob_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event, - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { return view3d_drop_id_in_main_region_poll(C, drag, event, ID_OB); } @@ -479,7 +479,7 @@ static bool view3d_ob_drop_poll(bContext *C, static bool view3d_collection_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event, - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { return view3d_drop_id_in_main_region_poll(C, drag, event, ID_GR); } @@ -487,7 +487,7 @@ static bool view3d_collection_drop_poll(bContext *C, static bool view3d_mat_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event, - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { return view3d_drop_id_in_main_region_poll(C, drag, event, ID_MA); } @@ -495,7 +495,7 @@ static bool view3d_mat_drop_poll(bContext *C, static bool view3d_ima_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event, - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { if (ED_region_overlap_isect_any_xy(CTX_wm_area(C), &event->x)) { return false; @@ -524,9 +524,9 @@ static bool view3d_ima_bg_is_camera_view(bContext *C) static bool view3d_ima_bg_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event, - const char **tooltip) + const char **r_tooltip) { - if (!view3d_ima_drop_poll(C, drag, event, tooltip)) { + if (!view3d_ima_drop_poll(C, drag, event, r_tooltip)) { return false; } @@ -540,9 +540,9 @@ static bool view3d_ima_bg_drop_poll(bContext *C, static bool view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event, - const char **tooltip) + const char **r_tooltip) { - if (!view3d_ima_drop_poll(C, drag, event, tooltip)) { + if (!view3d_ima_drop_poll(C, drag, event, r_tooltip)) { return false; } @@ -562,7 +562,7 @@ static bool view3d_ima_empty_drop_poll(bContext *C, static bool view3d_volume_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { return (drag->type == WM_DRAG_PATH) && (drag->icon == ICON_FILE_VOLUME); } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 8af651c7309..694cb7ee7d4 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -881,7 +881,7 @@ void ED_view3d_draw_depth(Depsgraph *depsgraph, ARegion *region, View3D *v3d, bo /* ******************** other elements ***************** */ /** could move this elsewhere, but tied into #ED_view3d_grid_scale */ -float ED_scene_grid_scale(const Scene *scene, const char **grid_unit) +float ED_scene_grid_scale(const Scene *scene, const char **r_grid_unit) { /* apply units */ if (scene->unit.system) { @@ -892,8 +892,8 @@ float ED_scene_grid_scale(const Scene *scene, const char **grid_unit) if (usys) { int i = bUnit_GetBaseUnit(usys); - if (grid_unit) { - *grid_unit = bUnit_GetNameDisplay(usys, i); + if (r_grid_unit) { + *r_grid_unit = bUnit_GetNameDisplay(usys, i); } return (float)bUnit_GetScaler(usys, i) / scene->unit.scale_length; } @@ -902,9 +902,9 @@ float ED_scene_grid_scale(const Scene *scene, const char **grid_unit) return 1.0f; } -float ED_view3d_grid_scale(const Scene *scene, View3D *v3d, const char **grid_unit) +float ED_view3d_grid_scale(const Scene *scene, View3D *v3d, const char **r_grid_unit) { - return v3d->grid * ED_scene_grid_scale(scene, grid_unit); + return v3d->grid * ED_scene_grid_scale(scene, r_grid_unit); } #define STEPS_LEN 8 @@ -958,7 +958,7 @@ void ED_view3d_grid_steps(const Scene *scene, float ED_view3d_grid_view_scale(Scene *scene, View3D *v3d, RegionView3D *rv3d, - const char **grid_unit) + const char **r_grid_unit) { float grid_scale; if (!rv3d->is_persp && RV3D_VIEW_IS_AXIS(rv3d->view)) { @@ -977,18 +977,18 @@ float ED_view3d_grid_view_scale(Scene *scene, } } - if (grid_unit) { + if (r_grid_unit) { const void *usys; int len; bUnit_GetSystem(scene->unit.system, B_UNIT_LENGTH, &usys, &len); if (usys) { - *grid_unit = bUnit_GetNameDisplay(usys, len - i - 1); + *r_grid_unit = bUnit_GetNameDisplay(usys, len - i - 1); } } } else { - grid_scale = ED_view3d_grid_scale(scene, v3d, grid_unit); + grid_scale = ED_view3d_grid_scale(scene, v3d, r_grid_unit); } return grid_scale; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 6e1533e50fd..30587e6084d 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1557,7 +1557,7 @@ void VIEW3D_OT_localview_remove_from(wmOperatorType *ot) static uint free_localcollection_bit(Main *bmain, unsigned short local_collections_uuid, - bool *reset) + bool *r_reset) { ScrArea *sa; bScreen *sc; @@ -1587,7 +1587,7 @@ static uint free_localcollection_bit(Main *bmain, /* Otherwise get the first free available. */ for (int i = 0; i < 16; i++) { if ((local_view_bits & (1 << i)) == 0) { - *reset = true; + *r_reset = true; return (1 << i); } } |