[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46319] trunk/blender/source/blender: code cleanup: BKE_libblock_find_name() now takes an ID constant rather then a string.
Campbell Barton
ideasman42 at gmail.com
Sat May 5 19:00:12 CEST 2012
Revision: 46319
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46319
Author: campbellbarton
Date: 2012-05-05 17:00:11 +0000 (Sat, 05 May 2012)
Log Message:
-----------
code cleanup: BKE_libblock_find_name() now takes an ID constant rather then a string.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_library.h
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: trunk/blender/source/blender/blenkernel/BKE_library.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_library.h 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/blenkernel/BKE_library.h 2012-05-05 17:00:11 UTC (rev 46319)
@@ -82,7 +82,7 @@
void test_idbutton(char *name);
void text_idbutton(struct ID *id, char *text);
void BKE_library_make_local(struct Main *bmain, struct Library *lib, int untagged_only);
-struct ID *BKE_libblock_find_name(const char *type, const char *name);
+struct ID *BKE_libblock_find_name(const short type, const char *name);
void clear_id_newpoins(void);
void IDnames_to_pupstring(const char **str, const char *title, const char *extraops,
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -943,9 +943,9 @@
/* ***************** ID ************************ */
-ID *BKE_libblock_find_name(const char *type, const char *name) /* type: "OB" or "MA" etc */
+ID *BKE_libblock_find_name(const short type, const char *name) /* type: "OB" or "MA" etc */
{
- ListBase *lb= which_libbase(G.main, GS(type));
+ ListBase *lb= which_libbase(G.main, type);
return BLI_findstring(lb, name, offsetof(ID, name) + 2);
}
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -615,7 +615,7 @@
/* called from creator.c */
Scene *BKE_scene_set_name(Main *bmain, const char *name)
{
- Scene *sce= (Scene *)BKE_libblock_find_name("SC", name);
+ Scene *sce = (Scene *)BKE_libblock_find_name(ID_SCE, name);
if (sce) {
BKE_scene_set_background(bmain, sce);
printf("Scene switch: '%s' in file: '%s'\n", name, G.main->name);
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -560,7 +560,7 @@
}
else {
RNA_string_get(op->ptr, "name", name);
- ima = (Image *)BKE_libblock_find_name("IM", name);
+ ima = (Image *)BKE_libblock_find_name(ID_IM, name);
}
if (!ima) {
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/object/object_add.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -1954,7 +1954,7 @@
/* find object, create fake base */
RNA_string_get(op->ptr, "name", name);
- ob = (Object *)BKE_libblock_find_name("OB", name);
+ ob = (Object *)BKE_libblock_find_name(ID_OB, name);
if (ob == NULL)
return OPERATOR_CANCELLED;
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -1911,7 +1911,7 @@
char name[MAX_ID_NAME - 2];
RNA_string_get(op->ptr, "name", name);
- ma = (Material *)BKE_libblock_find_name("MA", name);
+ ma = (Material *)BKE_libblock_find_name(ID_MA, name);
if (base == NULL || ma == NULL)
return OPERATOR_CANCELLED;
Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/object/object_select.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -884,7 +884,7 @@
flip_side_name(tmpname, primbase->object->id.name + 2, TRUE);
if (strcmp(tmpname, primbase->object->id.name + 2) != 0) { /* names differ */
- Object *ob = (Object *)BKE_libblock_find_name("OB", tmpname);
+ Object *ob = (Object *)BKE_libblock_find_name(ID_OB, tmpname);
if (ob) {
Base *secbase = BKE_scene_base_find(scene, ob);
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -2945,7 +2945,7 @@
BLI_strncpy(cache->saved_active_brush_name, brush->id.name + 2, sizeof(cache->saved_active_brush_name));
- br = (Brush *)BKE_libblock_find_name("BR", "Smooth");
+ br = (Brush *)BKE_libblock_find_name(ID_BR, "Smooth");
if (br) {
paint_brush_set(p, br);
brush = br;
@@ -3508,7 +3508,7 @@
/* Alt-Smooth */
if (ss->cache->alt_smooth) {
Paint *p = &sd->paint;
- brush = (Brush *)BKE_libblock_find_name("BR", ss->cache->saved_active_brush_name);
+ brush = (Brush *)BKE_libblock_find_name(ID_BR, ss->cache->saved_active_brush_name);
if (brush) {
paint_brush_set(p, brush);
}
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -3418,7 +3418,7 @@
else if (RNA_struct_property_is_set(op->ptr, "name")) {
char name[MAX_ID_NAME-2];
RNA_string_get(op->ptr, "name", name);
- ima= (Image *)BKE_libblock_find_name("IM", name);
+ ima= (Image *)BKE_libblock_find_name(ID_IM, name);
if (!ima) {
BKE_reportf(op->reports, RPT_ERROR, "Image named \"%s\", not found", name);
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -1402,9 +1402,9 @@
partype= RNA_enum_get(op->ptr, "type");
RNA_string_get(op->ptr, "parent", parname);
- par= (Object *)BKE_libblock_find_name("OB", parname);
+ par= (Object *)BKE_libblock_find_name(ID_OB, parname);
RNA_string_get(op->ptr, "child", childname);
- ob= (Object *)BKE_libblock_find_name("OB", childname);
+ ob= (Object *)BKE_libblock_find_name(ID_OB, childname);
ED_object_parent_set(op->reports, bmain, scene, ob, par, partype);
@@ -1473,9 +1473,9 @@
RNA_string_set(op->ptr, "parent", te_found->name);
/* Identify parent and child */
RNA_string_get(op->ptr, "child", childname);
- ob= (Object *)BKE_libblock_find_name("OB", childname);
+ ob= (Object *)BKE_libblock_find_name(ID_OB, childname);
RNA_string_get(op->ptr, "parent", parname);
- par= (Object *)BKE_libblock_find_name("OB", parname);
+ par= (Object *)BKE_libblock_find_name(ID_OB, parname);
if (ELEM(NULL, ob, par)) {
if (par == NULL) printf("par==NULL\n");
@@ -1659,7 +1659,7 @@
char obname[MAX_ID_NAME];
RNA_string_get(op->ptr, "dragged_obj", obname);
- ob= (Object *)BKE_libblock_find_name("OB", obname);
+ ob= (Object *)BKE_libblock_find_name(ID_OB, obname);
/* check dragged object (child) is active */
if (ob != CTX_data_active_object(C))
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-05-05 16:38:23 UTC (rev 46318)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-05-05 17:00:11 UTC (rev 46319)
@@ -3184,7 +3184,7 @@
}
else if (RNA_struct_property_is_set(op->ptr, "name")) {
RNA_string_get(op->ptr, "name", name);
- ima = (Image *)BKE_libblock_find_name("IM", name);
+ ima = (Image *)BKE_libblock_find_name(ID_IM, name);
}
bgpic = background_image_add(C);
More information about the Bf-blender-cvs
mailing list