diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 12:48:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 12:48:56 +0300 |
| commit | 3fa048a95b1045692480763f52e2f8a421bcc852 (patch) | |
| tree | 17da9076f4061fda2a61830022dd68c0e49d56ee /source/blender/blenkernel | |
| parent | 9cdda6e9ca72d791a55e268df28583fce25532de (diff) | |
| parent | 4b96452e625c882cceeffc80228aeecd3084f77f (diff) | |
Merge branch '28' into temp-scene-obedit-removetemp-scene-obedit-remove
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 2d82d5a1e0a..2d655913b3e 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -268,7 +268,7 @@ static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChild ViewLayer *view_layer = ctx->view_layer; for (Base *base = view_layer->object_bases.first; base; base = base->next, baseid++) { Object *ob = base->object; - if (ob != ctx->obedit && is_child(ob, parent)) { + if ((ob != ctx->obedit) && is_child(ob, parent)) { DupliContext pctx; copy_dupli_context(&pctx, ctx, ctx->object, NULL, baseid, false); diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 845afb8af3c..52c85011b6a 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -223,7 +223,7 @@ void BKE_object_handle_data_update( } /* particles */ - if (ob != OBEDIT_FROM_EVAL_CTX(eval_ctx) && ob->particlesystem.first) { + if ((ob != OBEDIT_FROM_EVAL_CTX(eval_ctx)) && ob->particlesystem.first) { ParticleSystem *tpsys, *psys; DerivedMesh *dm; ob->transflag &= ~OB_DUPLIPARTS; |