diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 12:22:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 15:37:55 +0300 |
commit | 41945fcfe4c4ec1cd21e642f4aaa9a5b1f150b1b (patch) | |
tree | 0c61dbf4948ab4e3a3bc26304d9ea336492ebf76 | |
parent | 4a3ddd8a7a5bc1851f832869310b5340a6b41d46 (diff) |
Cleanup: some ED_view3d functions used uppercase D
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 8 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 18 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 6 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 36af7e7e92e..e262e3eece6 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -422,11 +422,11 @@ bool ED_view3d_camera_lock_autokey( struct View3D *v3d, struct RegionView3D *rv3d, struct bContext *C, const bool do_rotate, const bool do_translate); -void ED_view3D_lock_clear(struct View3D *v3d); +void ED_view3d_lock_clear(struct View3D *v3d); -struct BGpic *ED_view3D_background_image_new(struct View3D *v3d); -void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic); -void ED_view3D_background_image_clear(struct View3D *v3d); +struct BGpic *ED_view3d_background_image_new(struct View3D *v3d); +void ED_view3d_background_image_remove(struct View3D *v3d, struct BGpic *bgpic); +void ED_view3d_background_image_clear(struct View3D *v3d); #define VIEW3D_MARGIN 1.4f #define VIEW3D_DIST_FALLBACK 1.0f diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c401b6618f2..7b5fc8ee061 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -107,7 +107,7 @@ void ED_view3d_lastview_store(RegionView3D *rv3d) } } -void ED_view3D_lock_clear(View3D *v3d) +void ED_view3d_lock_clear(View3D *v3d) { v3d->ob_centre = NULL; v3d->ob_centre_bone[0] = '\0'; @@ -3274,7 +3274,7 @@ static int view_lock_clear_exec(bContext *C, wmOperator *UNUSED(op)) View3D *v3d = CTX_wm_view3d(C); if (v3d) { - ED_view3D_lock_clear(v3d); + ED_view3d_lock_clear(v3d); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); @@ -3314,7 +3314,7 @@ static int view_lock_to_active_exec(bContext *C, wmOperator *UNUSED(op)) if (v3d) { - ED_view3D_lock_clear(v3d); + ED_view3d_lock_clear(v3d); v3d->ob_centre = obact; /* can be NULL */ @@ -4688,7 +4688,7 @@ static BGpic *background_image_add(bContext *C) { View3D *v3d = CTX_wm_view3d(C); - return ED_view3D_background_image_new(v3d); + return ED_view3d_background_image_new(v3d); } static int background_image_add_exec(bContext *C, wmOperator *UNUSED(op)) @@ -4761,7 +4761,7 @@ static int background_image_remove_exec(bContext *C, wmOperator *op) id_us_min((ID *)bgpic_rem->clip); } - ED_view3D_background_image_remove(v3d, bgpic_rem); + ED_view3d_background_image_remove(v3d, bgpic_rem); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d); return OPERATOR_FINISHED; @@ -5443,7 +5443,7 @@ void ED_view3d_to_object(Object *ob, const float ofs[3], const float quat[4], co /** \name Background Image Utilities * \{ */ -BGpic *ED_view3D_background_image_new(View3D *v3d) +BGpic *ED_view3d_background_image_new(View3D *v3d) { BGpic *bgpic = MEM_callocN(sizeof(BGpic), "Background Image"); @@ -5460,21 +5460,21 @@ BGpic *ED_view3D_background_image_new(View3D *v3d) return bgpic; } -void ED_view3D_background_image_remove(View3D *v3d, BGpic *bgpic) +void ED_view3d_background_image_remove(View3D *v3d, BGpic *bgpic) { BLI_remlink(&v3d->bgpicbase, bgpic); MEM_freeN(bgpic); } -void ED_view3D_background_image_clear(View3D *v3d) +void ED_view3d_background_image_clear(View3D *v3d) { BGpic *bgpic = v3d->bgpicbase.first; while (bgpic) { BGpic *next_bgpic = bgpic->next; - ED_view3D_background_image_remove(v3d, bgpic); + ED_view3d_background_image_remove(v3d, bgpic); bgpic = next_bgpic; } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index ebbebb32974..f3a7cd485d9 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1431,7 +1431,7 @@ static void rna_BackgroundImage_size_set(PointerRNA *ptr, float value) static BGpic *rna_BackgroundImage_new(View3D *v3d) { - BGpic *bgpic = ED_view3D_background_image_new(v3d); + BGpic *bgpic = ED_view3d_background_image_new(v3d); WM_main_add_notifier(NC_SPACE | ND_SPACE_VIEW3D, v3d); @@ -1445,7 +1445,7 @@ static void rna_BackgroundImage_remove(View3D *v3d, ReportList *reports, Pointer BKE_report(reports, RPT_ERROR, "Background image cannot be removed"); } - ED_view3D_background_image_remove(v3d, bgpic); + ED_view3d_background_image_remove(v3d, bgpic); RNA_POINTER_INVALIDATE(bgpic_ptr); WM_main_add_notifier(NC_SPACE | ND_SPACE_VIEW3D, v3d); @@ -1453,7 +1453,7 @@ static void rna_BackgroundImage_remove(View3D *v3d, ReportList *reports, Pointer static void rna_BackgroundImage_clear(View3D *v3d) { - ED_view3D_background_image_clear(v3d); + ED_view3d_background_image_clear(v3d); WM_main_add_notifier(NC_SPACE | ND_SPACE_VIEW3D, v3d); } diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 36c4d0089f9..98ef7a1a6ee 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -481,9 +481,9 @@ void ED_node_tree_pop(struct SpaceNode *snode) RET_NONE int ED_view3d_scene_layer_set(int lay, const int *values, int *active) RET_ZERO void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, bool do_clip) RET_NONE void ED_view3d_from_m4(float mat[4][4], float ofs[3], float quat[4], float *dist) RET_NONE -struct BGpic *ED_view3D_background_image_new(struct View3D *v3d) RET_NULL -void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic) RET_NONE -void ED_view3D_background_image_clear(struct View3D *v3d) RET_NONE +struct BGpic *ED_view3d_background_image_new(struct View3D *v3d) RET_NULL +void ED_view3d_background_image_remove(struct View3D *v3d, struct BGpic *bgpic) RET_NONE +void ED_view3d_background_image_clear(struct View3D *v3d) RET_NONE void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[4][4], float winmat[4][4], const struct rcti *rect) RET_NONE float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char **grid_unit) RET_ZERO void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct View3D *v3d, struct ScrArea *sa) RET_NONE |