diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:04:04 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:04:04 +0300 |
commit | 16100f8261770e367b0892bb38c778699ed609fe (patch) | |
tree | 97232730f4680cd689cfa086c5434761c7dd33c7 /source/blender/blenloader | |
parent | b53d358261a26652d510d62565f1b43035a55e67 (diff) |
Cleanup: get rid of last G.main usages in BKE library code.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/blend_validate.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c index 0963fdd78e0..4fb5d0e1286 100644 --- a/source/blender/blenloader/intern/blend_validate.c +++ b/source/blender/blenloader/intern/blend_validate.c @@ -81,7 +81,7 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports) continue; } - BKE_library_filepath_set(curlib, curlib->name); + BKE_library_filepath_set(bmain, curlib, curlib->name); BlendHandle *bh = BLO_blendhandle_from_file(curlib->filepath, reports); if (bh == NULL) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 9e9481566b0..2a728fc29c0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8205,7 +8205,7 @@ static BHead *read_libblock(FileData *fd, Main *main, BHead *bhead, const short } else { DEBUG_PRINTF("... in %s (%s): ", main->curlib ? main->curlib->id.name : "<NULL>", main->curlib ? main->curlib->name : "<NULL>"); - if ((id = BKE_libblock_find_name_ex(main, GS(idname), idname + 2))) { + if ((id = BKE_libblock_find_name(main, GS(idname), idname + 2))) { DEBUG_PRINTF("FOUND!\n"); /* Even though we found our linked ID, there is no guarantee its address is still the same... */ if (id != bhead->old) { diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 7e05ba1f529..29e3c926153 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -230,7 +230,7 @@ void BLO_update_defaults_startup_blend(Main *bmain) { Object *ob; - ob = (Object *)BKE_libblock_find_name_ex(bmain, ID_OB, "Camera"); + ob = (Object *)BKE_libblock_find_name(bmain, ID_OB, "Camera"); if (ob) { ob->rot[1] = 0.0f; } @@ -239,7 +239,7 @@ void BLO_update_defaults_startup_blend(Main *bmain) { Brush *br; - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Fill"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Fill"); if (!br) { br = BKE_brush_add(bmain, "Fill", OB_MODE_TEXTURE_PAINT); id_us_min(&br->id); /* fake user only */ @@ -248,14 +248,14 @@ void BLO_update_defaults_startup_blend(Main *bmain) } /* Vertex/Weight Paint */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Average"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Average"); if (!br) { br = BKE_brush_add(bmain, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT); id_us_min(&br->id); /* fake user only */ br->vertexpaint_tool = PAINT_BLEND_AVERAGE; br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT; } - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Smear"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Smear"); if (!br) { br = BKE_brush_add(bmain, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT); id_us_min(&br->id); /* fake user only */ @@ -263,49 +263,49 @@ void BLO_update_defaults_startup_blend(Main *bmain) br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT; } - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Mask"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Mask"); if (br) { br->imagepaint_tool = PAINT_TOOL_MASK; br->ob_mode |= OB_MODE_TEXTURE_PAINT; } /* remove polish brush (flatten/contrast does the same) */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Polish"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Polish"); if (br) { BKE_libblock_delete(bmain, br); } /* remove brush brush (huh?) from some modes (draw brushes do the same) */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Brush"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Brush"); if (br) { BKE_libblock_delete(bmain, br); } /* remove draw brush from texpaint (draw brushes do the same) */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Draw"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Draw"); if (br) { br->ob_mode &= ~OB_MODE_TEXTURE_PAINT; } /* rename twist brush to rotate brush to match rotate tool */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Twist"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Twist"); if (br) { BKE_libblock_rename(bmain, &br->id, "Rotate"); } /* use original normal for grab brush (otherwise flickers with normal weighting). */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Grab"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Grab"); if (br) { br->flag |= BRUSH_ORIGINAL_NORMAL; } /* increase strength, better for smoothing method */ - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Blur"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Blur"); if (br) { br->alpha = 1.0f; } - br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Flatten/Contrast"); + br = (Brush *)BKE_libblock_find_name(bmain, ID_BR, "Flatten/Contrast"); if (br) { br->flag |= BRUSH_ACCUMULATE; } |