diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-25 11:13:09 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-25 14:04:14 +0300 |
commit | 9e3e648a0843b8a45c3d165e710657069bafaf5e (patch) | |
tree | ca7743064bf6723c88f321436cb01c3ac6d8a2be /intern | |
parent | 1d7bdbd273abdb6f606fac0a651986166cee62a4 (diff) |
Depsgraph: Clarify python API
Follow same naming convention as for C:
- Original data is named without any extra prefix/suffix.
- Evaluated data is named with _eval suffix.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index e6aabb5fe36..9d55ece3e0c 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -372,7 +372,7 @@ void BlenderSession::render(BL::Depsgraph& b_depsgraph_) BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_v3d, b_rv3d, scene->camera, width, height); /* render each layer */ - BL::ViewLayer b_view_layer = b_depsgraph.view_layer(); + BL::ViewLayer b_view_layer = b_depsgraph.view_layer_eval(); /* We do some special meta attributes when we only have single layer. */ const bool is_single_layer = (b_scene.view_layers.length() == 1); diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index ddf18e9f3c7..cc2a6824190 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -1229,7 +1229,7 @@ void BlenderSync::sync_materials(BL::Depsgraph& b_depsgraph, bool update_all) ++b_mat_orig) { /* TODO(sergey): Iterate over evaluated data rather than using mapping. */ - BL::Material b_mat_(b_depsgraph.evaluated_id_get(*b_mat_orig)); + BL::Material b_mat_(b_depsgraph.id_eval_get(*b_mat_orig)); BL::Material *b_mat = &b_mat_; Shader *shader; @@ -1403,7 +1403,7 @@ void BlenderSync::sync_lamps(BL::Depsgraph& b_depsgraph, bool update_all) ++b_lamp_orig) { /* TODO(sergey): Iterate over evaluated data rather than using mapping. */ - BL::Lamp b_lamp_(b_depsgraph.evaluated_id_get(*b_lamp_orig)); + BL::Lamp b_lamp_(b_depsgraph.id_eval_get(*b_lamp_orig)); BL::Lamp *b_lamp = &b_lamp_; Shader *shader; diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index bf35f61f07b..94438f613ce 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -195,7 +195,7 @@ void BlenderSync::sync_data(BL::RenderSettings& b_render, int width, int height, void **python_thread_state) { - BL::ViewLayer b_view_layer = b_depsgraph.view_layer(); + BL::ViewLayer b_view_layer = b_depsgraph.view_layer_eval(); sync_view_layer(b_v3d, b_view_layer); sync_integrator(); |