diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-26 21:17:22 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-26 21:17:22 +0300 |
| commit | c1742b88a4cf58e474b3dfe9d01921105b8c8b6e (patch) | |
| tree | 1147fc9d41c9200f9f591d6dd26720af4f1225b3 /source/blender/blenkernel/BKE_object.h | |
| parent | 8f673cb40c6d038ecaabd24c6549dc5c7571c26a (diff) | |
| parent | 8d04f49d0ea53552500e82afea92addaaa939dfd (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into render-layers
Note:
renamed blo_do_versions_after_linking_280 to do_versions_after_linking_280 to following the pattern of do_versions_after_linking_270
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index d1e7e2e5e45..e25b71d508e 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -207,6 +207,7 @@ void BKE_object_eval_uber_transform(struct EvaluationContext *eval_ctx, void BKE_object_eval_uber_data(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob); +void BKE_object_eval_shading(struct EvaluationContext *eval_ctx, struct Object *ob); void BKE_object_handle_data_update(struct EvaluationContext *eval_ctx, struct Scene *scene, |