[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46315] trunk/blender/source: code cleanup : BKE_ naming, also make bpy.data.images.load() always load a new image.
Campbell Barton
ideasman42 at gmail.com
Sat May 5 16:52:04 CEST 2012
Revision: 46315
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46315
Author: campbellbarton
Date: 2012-05-05 14:52:04 +0000 (Sat, 05 May 2012)
Log Message:
-----------
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_font.h
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/BKE_text.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/render/render_shading.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_text_api.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_font.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_font.h 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/BKE_font.h 2012-05-05 14:52:04 UTC (rev 46315)
@@ -71,17 +71,17 @@
} EditFont;
-void BKE_font_register_builtin(void *mem, int size);
+void BKE_vfont_builtin_register(void *mem, int size);
void BKE_vfont_free(struct VFont *sc);
-void free_ttfont(void);
-struct VFont *get_builtin_font(void);
-struct VFont *load_vfont(struct Main *bmain, const char *name);
-struct TmpFont *vfont_find_tmpfont(struct VFont *vfont);
+void BKE_vfont_free_global_ttf(void);
+struct VFont *BKE_vfont_builtin_get(void);
+struct VFont *BKE_vfont_load(struct Main *bmain, const char *name);
+struct TmpFont *BKE_vfont_find_tmpfont(struct VFont *vfont);
-struct chartrans *BKE_text_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode);
+struct chartrans *BKE_vfont_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode);
-int BKE_font_getselection(struct Object *ob, int *start, int *end);
+int BKE_vfont_select_get(struct Object *ob, int *start, int *end);
#ifdef __cplusplus
}
Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_image.h 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h 2012-05-05 14:52:04 UTC (rev 46315)
@@ -74,7 +74,7 @@
void image_de_interlace(struct Image *ima, int odd);
-void make_local_image(struct Image *ima);
+void BKE_image_make_local(struct Image *ima);
void tag_image_time(struct Image *ima);
void free_old_images(void);
@@ -130,8 +130,10 @@
struct ImBuf *BKE_image_acquire_ibuf(struct Image *ima, struct ImageUser *iuser, void **lock_r);
void BKE_image_release_ibuf(struct Image *ima, void *lock);
+/* returns a new image or NULL if it can't load */
+struct Image *BKE_image_load(const char *filepath);
/* returns existing Image when filename/type is same (frame optional) */
-struct Image *BKE_add_image_file(const char *name);
+struct Image *BKE_image_load_exists(const char *filepath);
/* adds image, adds ibuf, generates color or pattern */
struct Image *BKE_add_image_size(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short uvtestgrid, float color[4]);
Modified: trunk/blender/source/blender/blenkernel/BKE_text.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_text.h 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/BKE_text.h 2012-05-05 14:52:04 UTC (rev 46315)
@@ -45,14 +45,14 @@
void BKE_text_free (struct Text *text);
void txt_set_undostate (int u);
int txt_get_undostate (void);
-struct Text* add_empty_text (const char *name);
+struct Text* BKE_text_add (const char *name);
int txt_extended_ascii_as_utf8(char **str);
-int reopen_text (struct Text *text);
-struct Text* add_text (const char *file, const char *relpath);
+int BKE_text_reload (struct Text *text);
+struct Text* BKE_text_load (const char *file, const char *relpath);
struct Text* BKE_text_copy (struct Text *ta);
void BKE_text_unlink (struct Main *bmain, struct Text *text);
-void clear_text(struct Text *text);
-void write_text(struct Text *text, const char *str);
+void BKE_text_clear (struct Text *text);
+void BKE_text_write (struct Text *text, const char *str);
char* txt_to_buf (struct Text *text);
void txt_clean_text (struct Text *text);
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2012-05-05 14:52:04 UTC (rev 46315)
@@ -1545,7 +1545,7 @@
/* in par the family name is stored, use this to find the other objects */
- chartransdata= BKE_text_to_curve(G.main, scene, par, FO_DUPLI);
+ chartransdata= BKE_vfont_to_curve(G.main, scene, par, FO_DUPLI);
if (chartransdata==NULL) return;
cu= par->data;
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-05-05 14:52:04 UTC (rev 46315)
@@ -175,7 +175,7 @@
cu->bb= BKE_boundbox_alloc_unit();
if (type==OB_FONT) {
- cu->vfont= cu->vfontb= cu->vfonti= cu->vfontbi= get_builtin_font();
+ cu->vfont= cu->vfontb= cu->vfonti= cu->vfontbi= BKE_vfont_builtin_get();
cu->vfont->id.us+=4;
cu->str= MEM_mallocN(12, "str");
BLI_strncpy(cu->str, "Text", 12);
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-05 14:52:04 UTC (rev 46315)
@@ -1271,7 +1271,7 @@
if (cu->path) free_path(cu->path);
cu->path= NULL;
- if (ob->type==OB_FONT) BKE_text_to_curve(G.main, scene, ob, 0);
+ if (ob->type==OB_FONT) BKE_vfont_to_curve(G.main, scene, ob, 0);
if (!forOrco) curve_calc_modifiers_pre(scene, ob, forRender, &originalVerts, &deformedVerts, &numVerts);
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2012-05-05 14:52:04 UTC (rev 46315)
@@ -93,7 +93,7 @@
static void *builtin_font_data= NULL;
static int builtin_font_size= 0;
-void BKE_font_register_builtin(void *mem, int size)
+void BKE_vfont_builtin_register(void *mem, int size)
{
builtin_font_data= mem;
builtin_font_size= size;
@@ -115,7 +115,7 @@
}
}
-void free_ttfont(void)
+void BKE_vfont_free_global_ttf(void)
{
struct TmpFont *tf;
@@ -127,7 +127,7 @@
BLI_freelistN(&ttfdata);
}
-struct TmpFont *vfont_find_tmpfont(VFont *vfont)
+struct TmpFont *BKE_vfont_find_tmpfont(VFont *vfont)
{
struct TmpFont *tmpfnt = NULL;
@@ -151,7 +151,7 @@
if (vfont==NULL) return NULL;
// Try finding the font from font list
- tmpfnt = vfont_find_tmpfont(vfont);
+ tmpfnt = BKE_vfont_find_tmpfont(vfont);
// And then set the data
if (!vfont->data) {
@@ -210,7 +210,7 @@
return vfont->data;
}
-VFont *load_vfont(Main *bmain, const char *name)
+VFont *BKE_vfont_load(Main *bmain, const char *name)
{
char filename[FILE_MAXFILE];
VFont *vfont= NULL;
@@ -290,7 +290,7 @@
}
}
-VFont *get_builtin_font(void)
+VFont *BKE_vfont_builtin_get(void)
{
VFont *vf;
@@ -298,7 +298,7 @@
if (strcmp(vf->name, FO_BUILTIN_NAME)==0)
return vf;
- return load_vfont(G.main, FO_BUILTIN_NAME);
+ return BKE_vfont_load(G.main, FO_BUILTIN_NAME);
}
static VChar *find_vfont_char(VFontData *vfd, intptr_t character)
@@ -487,7 +487,7 @@
}
}
-int BKE_font_getselection(Object *ob, int *start, int *end)
+int BKE_vfont_select_get(Object *ob, int *start, int *end)
{
Curve *cu= ob->data;
@@ -520,7 +520,7 @@
}
}
-struct chartrans *BKE_text_to_curve(Main *bmain, Scene *scene, Object *ob, int mode)
+struct chartrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int mode)
{
VFont *vfont, *oldvfont;
VFontData *vfd= NULL;
@@ -605,7 +605,7 @@
if (cu->selboxes) MEM_freeN(cu->selboxes);
cu->selboxes = NULL;
- if (BKE_font_getselection(ob, &selstart, &selend))
+ if (BKE_vfont_select_get(ob, &selstart, &selend))
cu->selboxes = MEM_callocN((selend-selstart+1)*sizeof(SelBox), "font selboxes");
tb = &(cu->tb[0]);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-05-05 14:33:36 UTC (rev 46314)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-05-05 14:52:04 UTC (rev 46315)
@@ -327,7 +327,7 @@
* match id_make_local pattern. */
}
-void make_local_image(struct Image *ima)
+void BKE_image_make_local(struct Image *ima)
{
Main *bmain= G.main;
Tex *tex;
@@ -505,26 +505,48 @@
}
}
+Image *BKE_image_load(const char *filepath)
+{
+ Image *ima;
+ int file, len;
+ const char *libname;
+ char str[FILE_MAX];
+ BLI_strncpy(str, filepath, sizeof(str));
+ BLI_path_abs(str, G.main->name);
+
+ /* exists? */
+ file= BLI_open(str, O_BINARY|O_RDONLY, 0);
+ if (file== -1) return NULL;
+ close(file);
+
+ /* create a short library name */
+ len= strlen(filepath);
+
+ while (len > 0 && filepath[len - 1] != '/' && filepath[len - 1] != '\\') len--;
+ libname= filepath+len;
+
+ ima= image_alloc(libname, IMA_SRC_FILE, IMA_TYPE_IMAGE);
+ BLI_strncpy(ima->name, filepath, sizeof(ima->name));
+
+ if (BLI_testextensie_array(filepath, imb_ext_movie))
+ ima->source= IMA_SRC_MOVIE;
+
+ return ima;
+}
+
/* checks if image was already loaded, then returns same image */
/* otherwise creates new. */
/* does not load ibuf itself */
/* pass on optional frame for #name images */
-Image *BKE_add_image_file(const char *name)
+Image *BKE_image_load_exists(const char *filepath)
{
Image *ima;
- int file, len;
- const char *libname;
char str[FILE_MAX], strtest[FILE_MAX];
- BLI_strncpy(str, name, sizeof(str));
+ BLI_strncpy(str, filepath, sizeof(str));
BLI_path_abs(str, G.main->name);
-
- /* exists? */
- file= BLI_open(str, O_BINARY|O_RDONLY, 0);
- if (file== -1) return NULL;
- close(file);
-
+
/* first search an identical image */
for (ima= G.main->image.first; ima; ima= ima->id.next) {
if (ima->source!=IMA_SRC_VIEWER && ima->source!=IMA_SRC_GENERATED) {
@@ -533,7 +555,7 @@
if (BLI_path_cmp(strtest, str)==0) {
if (ima->anim==NULL || ima->id.us==0) {
- BLI_strncpy(ima->name, name, sizeof(ima->name)); /* for stringcode */
+ BLI_strncpy(ima->name, filepath, sizeof(ima->name)); /* for stringcode */
ima->id.us++; /* officially should not, it doesn't link here! */
if (ima->ok==0)
ima->ok= IMA_OK;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list