Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-01-17 17:33:46 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-01-17 17:33:46 +0300
commit74ba736fc41893dc9e3bcb4b64239ce0ae05eae4 (patch)
tree367d0c98d8169c3d6f7330575c98a1347e6a2dc4 /source/blender/editors/object/object_bake.c
parent78b630844bdeedc988213f585f74d99d35d337f7 (diff)
Update selected_editable_bases to use ObjectBase
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
-rw-r--r--source/blender/editors/object/object_bake.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index 11d96da5786..fcc1c003b92 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -116,7 +116,7 @@ static bool multiresbake_check(bContext *C, wmOperator *op)
bool ok = true;
int a;
- CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+ CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
{
ob = base->object;
@@ -310,7 +310,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
if (scene->r.bake_flag & R_BAKE_CLEAR) { /* clear images */
- CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+ CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
{
Mesh *me;
ClearFlag clear_flag = 0;
@@ -330,7 +330,7 @@ static int multiresbake_image_exec_locked(bContext *C, wmOperator *op)
CTX_DATA_END;
}
- CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+ CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
{
MultiresBakeRender bkr = {NULL};
@@ -390,7 +390,7 @@ static void init_multiresbake_job(bContext *C, MultiresBakeJob *bkj)
bkj->user_scale = (scene->r.bake_flag & R_BAKE_USERSCALE) ? scene->r.bake_user_scale : -1.0f;
//bkj->reports = op->reports;
- CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
+ CTX_DATA_BEGIN (C, ObjectBase *, base, selected_editable_bases)
{
MultiresBakerJobData *data;
int lvl;