diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 18:52:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 18:52:04 +0400 |
| commit | 34b18fcbc18c6d89a1a1516d19c489994e4964dc (patch) | |
| tree | 2b53d4290e09ecb04762a1efc07d8553449faf11 /source/blender/editors/space_view3d | |
| parent | 299ff91ea1fe5623bea1c6775cb8250d5e4ec3a0 (diff) | |
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 37f24dda8ab..79dce3e6bcd 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -6647,7 +6647,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) setlinestyle(0); - if (BKE_font_getselection(ob, &selstart, &selend) && cu->selboxes) { + if (BKE_vfont_select_get(ob, &selstart, &selend) && cu->selboxes) { float selboxw; cpack(0xffffff); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index b5354ac5e03..de17f0af1e8 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3094,7 +3094,7 @@ static int background_image_add_invoke(bContext *C, wmOperator *op, wmEvent *UNU char path[FILE_MAX]; RNA_string_get(op->ptr, "filepath", path); - ima = BKE_add_image_file(path); + ima = BKE_image_load_exists(path); } else if (RNA_struct_property_is_set(op->ptr, "name")) { RNA_string_get(op->ptr, "name", name); |