Commit: 34ab90f546f097cada951b2c9ca22bf271996980 Author: Brecht Van Lommel Date: Fri Apr 6 12:07:27 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB34ab90f546f097cada951b2c9ca22bf271996980
Depsgraph: remove EvaluationContext, pass Depsgraph instead. The depsgraph was always created within a fixed evaluation context. Passing both risks the depsgraph and evaluation context not matching, and it complicates the Python API where we'd have to expose both which is not so easy to understand. This also removes the global evaluation context in main, which assumed there to be a single active scene and view layer. Differential Revision: https://developer.blender.org/D3152 =================================================================== M intern/cycles/blender/blender_session.cpp M release/datafiles/locale M release/scripts/addons M release/scripts/addons_contrib M source/blender/alembic/intern/abc_camera.cc M source/blender/alembic/intern/abc_camera.h M source/blender/alembic/intern/abc_curves.cc M source/blender/alembic/intern/abc_curves.h M source/blender/alembic/intern/abc_exporter.cc M source/blender/alembic/intern/abc_exporter.h M source/blender/alembic/intern/abc_hair.cc M source/blender/alembic/intern/abc_hair.h M source/blender/alembic/intern/abc_mball.cc M source/blender/alembic/intern/abc_mball.h M source/blender/alembic/intern/abc_mesh.cc M source/blender/alembic/intern/abc_mesh.h M source/blender/alembic/intern/abc_nurbs.cc M source/blender/alembic/intern/abc_nurbs.h M source/blender/alembic/intern/abc_object.cc M source/blender/alembic/intern/abc_object.h M source/blender/alembic/intern/abc_points.cc M source/blender/alembic/intern/abc_points.h M source/blender/alembic/intern/abc_transform.cc M source/blender/alembic/intern/abc_transform.h M source/blender/alembic/intern/alembic_capi.cc M source/blender/blenkernel/BKE_DerivedMesh.h M source/blender/blenkernel/BKE_anim.h M source/blender/blenkernel/BKE_animsys.h M source/blender/blenkernel/BKE_armature.h M source/blender/blenkernel/BKE_camera.h M source/blender/blenkernel/BKE_cloth.h M source/blender/blenkernel/BKE_constraint.h M source/blender/blenkernel/BKE_context.h M source/blender/blenkernel/BKE_crazyspace.h M source/blender/blenkernel/BKE_curve.h M source/blender/blenkernel/BKE_data_transfer.h M source/blender/blenkernel/BKE_displist.h M source/blender/blenkernel/BKE_dynamicpaint.h M source/blender/blenkernel/BKE_editmesh.h M source/blender/blenkernel/BKE_effect.h M source/blender/blenkernel/BKE_fluidsim.h M source/blender/blenkernel/BKE_group.h M source/blender/blenkernel/BKE_lattice.h M source/blender/blenkernel/BKE_layer.h M source/blender/blenkernel/BKE_main.h M source/blender/blenkernel/BKE_mask.h M source/blender/blenkernel/BKE_material.h M source/blender/blenkernel/BKE_mball.h M source/blender/blenkernel/BKE_mball_tessellate.h M source/blender/blenkernel/BKE_mesh.h M source/blender/blenkernel/BKE_modifier.h M source/blender/blenkernel/BKE_movieclip.h M source/blender/blenkernel/BKE_multires.h M source/blender/blenkernel/BKE_node.h M source/blender/blenkernel/BKE_object.h M source/blender/blenkernel/BKE_paint.h M source/blender/blenkernel/BKE_particle.h M source/blender/blenkernel/BKE_rigidbody.h M source/blender/blenkernel/BKE_scene.h M source/blender/blenkernel/BKE_sequencer.h M source/blender/blenkernel/BKE_smoke.h M source/blender/blenkernel/BKE_softbody.h M source/blender/blenkernel/BKE_tracking.h M source/blender/blenkernel/BKE_workspace.h M source/blender/blenkernel/BKE_world.h M source/blender/blenkernel/intern/DerivedMesh.c M source/blender/blenkernel/intern/anim.c M source/blender/blenkernel/intern/anim_sys.c M source/blender/blenkernel/intern/armature.c M source/blender/blenkernel/intern/armature_update.c M source/blender/blenkernel/intern/boids.c M source/blender/blenkernel/intern/camera.c M source/blender/blenkernel/intern/cloth.c M source/blender/blenkernel/intern/constraint.c M source/blender/blenkernel/intern/context.c M source/blender/blenkernel/intern/crazyspace.c M source/blender/blenkernel/intern/curve.c M source/blender/blenkernel/intern/data_transfer.c M source/blender/blenkernel/intern/displist.c M source/blender/blenkernel/intern/dynamicpaint.c M source/blender/blenkernel/intern/editderivedmesh.c M source/blender/blenkernel/intern/editmesh_bvh.c M source/blender/blenkernel/intern/editmesh_tangent.c M source/blender/blenkernel/intern/effect.c M source/blender/blenkernel/intern/fluidsim.c M source/blender/blenkernel/intern/group.c M source/blender/blenkernel/intern/lattice.c M source/blender/blenkernel/intern/layer.c M source/blender/blenkernel/intern/library.c M source/blender/blenkernel/intern/mask_evaluate.c M source/blender/blenkernel/intern/material.c M source/blender/blenkernel/intern/mball.c M source/blender/blenkernel/intern/mball_tessellate.c M source/blender/blenkernel/intern/mesh.c M source/blender/blenkernel/intern/modifier.c M source/blender/blenkernel/intern/movieclip.c M source/blender/blenkernel/intern/multires.c M source/blender/blenkernel/intern/node.c M source/blender/blenkernel/intern/object.c M source/blender/blenkernel/intern/object_dupli.c M source/blender/blenkernel/intern/object_update.c M source/blender/blenkernel/intern/paint.c M source/blender/blenkernel/intern/particle.c M source/blender/blenkernel/intern/particle_child.c M source/blender/blenkernel/intern/particle_distribute.c M source/blender/blenkernel/intern/particle_system.c M source/blender/blenkernel/intern/rigidbody.c M source/blender/blenkernel/intern/scene.c M source/blender/blenkernel/intern/sequencer.c M source/blender/blenkernel/intern/smoke.c M source/blender/blenkernel/intern/softbody.c M source/blender/blenkernel/intern/world.c M source/blender/collada/AnimationExporter.cpp M source/blender/collada/AnimationExporter.h M source/blender/collada/ArmatureExporter.cpp M source/blender/collada/ArmatureExporter.h M source/blender/collada/ControllerExporter.cpp M source/blender/collada/ControllerExporter.h M source/blender/collada/DocumentExporter.cpp M source/blender/collada/DocumentExporter.h M source/blender/collada/GeometryExporter.cpp M source/blender/collada/GeometryExporter.h M source/blender/collada/SceneExporter.cpp M source/blender/collada/SceneExporter.h M source/blender/collada/collada.cpp M source/blender/collada/collada.h M source/blender/collada/collada_utils.cpp M source/blender/collada/collada_utils.h M source/blender/depsgraph/DEG_depsgraph.h M source/blender/depsgraph/DEG_depsgraph_build.h M source/blender/depsgraph/DEG_depsgraph_query.h M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc M source/blender/depsgraph/intern/depsgraph_eval.cc M source/blender/depsgraph/intern/depsgraph_query_iter.cc M source/blender/depsgraph/intern/depsgraph_types.h M source/blender/depsgraph/intern/eval/deg_eval.cc M source/blender/depsgraph/intern/eval/deg_eval.h M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h M source/blender/depsgraph/intern/nodes/deg_node_component.h M source/blender/draw/engines/eevee/eevee_motion_blur.c M source/blender/draw/intern/DRW_render.h M source/blender/draw/intern/draw_cache_impl_particles.c M source/blender/draw/intern/draw_manager.c M source/blender/draw/modes/sculpt_mode.c M source/blender/editors/armature/armature_select.c M source/blender/editors/armature/armature_skinning.c M source/blender/editors/armature/editarmature_sketch.c M source/blender/editors/armature/pose_edit.c M source/blender/editors/armature/pose_lib.c M source/blender/editors/armature/pose_transform.c M source/blender/editors/armature/pose_utils.c M source/blender/editors/curve/editcurve.c M source/blender/editors/curve/editcurve_paint.c M source/blender/editors/curve/editfont.c M source/blender/editors/gpencil/drawgpencil.c M source/blender/editors/gpencil/gpencil_edit.c M source/blender/editors/gpencil/gpencil_paint.c M source/blender/editors/gpencil/gpencil_utils.c M source/blender/editors/include/ED_armature.h M source/blender/editors/include/ED_gpencil.h M source/blender/editors/include/ED_mesh.h M source/blender/editors/include/ED_object.h M source/blender/editors/include/ED_particle.h M source/blender/editors/include/ED_transform_snap_object_context.h M source/blender/editors/include/ED_view3d.h M source/blender/editors/interface/interface_eyedropper_depth.c M source/blender/editors/io/io_collada.c M source/blender/editors/manipulator_library/manipulator_library_presets.c M source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c M source/blender/editors/mesh/editface.c M source/blender/editors/mesh/editmesh_knife.c M source/blender/editors/mesh/editmesh_knife_project.c M source/blender/editors/mesh/editmesh_loopcut.c M source/blender/editors/mesh/editmesh_path.c M source/blender/editors/mesh/editmesh_select.c M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/mesh/editmesh_utils.c M source/blender/editors/mesh/mesh_navmesh.c M source/blender/editors/mesh/meshtools.c M source/blender/editors/metaball/mball_edit.c M source/blender/editors/object/object_add.c M source/blender/editors/object/object_bake_api.c M source/blender/editors/object/object_constraint.c M source/blender/editors/object/object_data_transfer.c M source/blender/editors/object/object_edit.c M source/blender/editors/object/object_hook.c M source/blender/editors/object/object_modes.c M source/blender/editors/object/object_modifier.c M source/blender/editors/object/object_relations.c M source/blender/editors/object/object_transform.c M source/blender/editors/object/object_vgroup.c M source/blender/editors/physics/dynamicpaint_ops.c M source/blender/editors/physics/particle_edit.c M source/blender/editors/physics/particle_object.c M source/blender/editors/physics/physics_fluid.c M source/blender/editors/physics/physics_intern.h M source/blender/editors/render/render_internal.c M source/blender/editors/render/render_opengl.c M source/blender/editors/scene/scene_edit.c M source/blender/editors/sculpt_paint/paint_hide.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sculpt_paint/paint_intern.h M source/blender/editors/sculpt_paint/paint_mask.c M source/blender/editors/sculpt_paint/paint_utils.c M source/blender/editors/sculpt_paint/paint_vertex.c M source/blender/editors/sculpt_paint/paint_vertex_proj.c M source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c M source/blender/editors/sculpt_paint/sculpt.c M source/blender/editors/sculpt_paint/sculpt_intern.h M source/blender/editors/sculpt_paint/sculpt_undo.c M source/blender/editors/space_clip/tracking_ops_orient.c M source/blender/editors/space_outliner/outliner_draw.c M source/blender/editors/space_outliner/outliner_intern.h M source/blender/editors/space_sequencer/sequencer_draw.c M source/blender/editors/space_sequencer/sequencer_edit.c M source/blender/editors/space_sequencer/sequencer_intern.h M source/blender/editors/space_view3d/drawarmature.c M source/blender/editors/space_view3d/drawobject.c M source/blender/editors/space_view3d/view3d_camera_control.c M source/blender/editors/space_view3d/view3d_draw.c M source/blender/editors/space_view3d/view3d_draw_legacy.c M source/blender/editors/space_view3d/view3d_edit.c M source/blender/editors/space_view3d/view3d_fly.c M source/blender/editors/space_view3d/view3d_intern.h M source/blender/editors/space_view3d/view3d_iterators.c M source/blender/editors/space_view3d/view3d_manipulator_ruler.c M source/blender/editors/space_view3d/view3d_project.c M source/blender/editors/space_view3d/view3d_ruler.c M source/blender/editors/space_view3d/view3d_select.c M source/blender/editors/space_view3d/view3d_snap.c M source/blender/editors/space_view3d/view3d_utils.c M source/blender/editors/space_view3d/view3d_view.c M source/blender/editors/space_view3d/view3d_walk.c M source/blender/editors/transform/transform.c M source/blender/editors/transform/transform.h M source/blender/editors/transform/transform_conversions.c M source/blender/editors/transform/transform_generics.c M source/blender/editors/transform/transform_snap.c M source/blender/editors/transform/transform_snap_object.c M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp M source/blender/gpu/intern/gpu_material.c M source/blender/ikplugin/BIK_api.h M source/blender/ikplugin/intern/ikplugin_api.c M source/blender/ikplugin/intern/ikplugin_api.h M source/blender/ikplugin/intern/iksolver_plugin.c M source/blender/ikplugin/intern/iksolver_plugin.h M source/blender/ikplugin/intern/itasc_plugin.cpp M source/blender/ikplugin/intern/itasc_plugin.h M source/blender/makesrna/intern/rna_main_api.c M source/blender/makesrna/intern/rna_meta.c M source/blender/makesrna/intern/rna_nodetree.c M source/blender/makesrna/intern/rna_scene_api.c M source/blender/makesrna/intern/rna_space_api.c M source/blender/modifiers/intern/MOD_armature.c M source/blender/modifiers/intern/MOD_array.c M source/blender/modifiers/intern/MOD_bevel.c M source/blender/modifiers/intern/MOD_boolean.c M source/blender/modifiers/intern/MOD_build.c M source/blender/modifiers/intern/MOD_cast.c M source/blender/modifiers/intern/MOD_cloth.c M source/blender/modifiers/intern/MOD_collision.c M source/blender/modifiers/intern/MOD_correctivesmooth.c M source/blender/modifiers/intern/MOD_curve.c M source/blender/modifiers/intern/MOD_datatransfer.c M source/blender/modifiers/intern/MOD_decimate.c M source/blender/modifiers/intern/MOD_displace.c M source/blender/modifiers/intern/MOD_dynamicpaint.c M source/blender/modifiers/intern/MOD_edgesplit.c M source/blender/modifiers/intern/MOD_explode.c M source/blender/modifiers/intern/MOD_fluidsim.c M source/blender/modifiers/intern/MOD_hook.c M source/blender/modifiers/intern/MOD_laplaciandeform.c M source/blender/modifiers/intern/MOD_laplaciansmooth.c M source/blender/modifiers/intern/MOD_lattice.c M source/blender/modifiers/intern/MOD_mask.c M source/blender/modifiers/intern/MOD_meshcache.c M source/blender/modifiers/intern/MOD_meshdeform.c M source/blender/modifiers/intern/MOD_meshsequencecache.c M source/blender/modifiers/intern/MOD_mirror.c M source/blender/modifiers/intern/MOD_multires.c M source/blender/modifiers/intern/MOD_normal_edit.c M source/blender/modifiers/intern/MOD_ocean.c M source/blender/modifiers/intern/MOD_particleinstance.c M source/blender/modifiers/intern/MOD_particlesystem.c M source/blender/modifiers/intern/MOD_remesh.c M source/blender/modifiers/intern/MOD_screw.c M source/blender/modifiers/intern/MOD_shapekey.c M source/blender/modifiers/intern/MOD_shrinkwrap.c M source/blender/modifiers/intern/MOD_simpledeform.c M source/blender/modifiers/intern/MOD_skin.c M source/blender/modifiers/intern/MOD_smoke.c M source/blender/modifiers/intern/MOD_smooth.c M source/blender/modifiers/intern/MOD_softbody.c M source/blender/modifiers/intern/MOD_solidify.c M source/blender/modifiers/intern/MOD_subsurf.c M source/blender/modifiers/intern/MOD_surface.c M source/blender/modifiers/intern/MOD_surfacedeform.c M source/blender/modifiers/intern/MOD_triangulate.c M source/blender/modifiers/intern/MOD_uvproject.c M source/blender/modifiers/intern/MOD_uvwarp.c M source/blender/modifiers/intern/MOD_warp.c M source/blender/modifiers/intern/MOD_wave.c M source/blender/modifiers/intern/MOD_weightvgedit.c M source/blender/modifiers/intern/MOD_weightvgmix.c M source/blender/modifiers/intern/MOD_weightvgproximity.c M source/blender/modifiers/intern/MOD_wireframe.c M source/blender/python/bmesh/bmesh_py_types.c M source/blender/python/intern/gpu_offscreen.c M source/blender/python/mathutils/mathutils_bvhtree.c M source/blender/render/extern/include/RE_engine.h M source/blender/render/extern/include/RE_pipeline.h M source/blender/render/extern/include/RE_render_ext.h M source/blender/render/intern/include/pointdensity.h M source/blender/render/intern/include/render_types.h M source/blender/render/intern/include/renderdatabase.h M source/blender/render/intern/source/convertblender.c M source/blender/render/intern/source/pipeline.c M source/blender/render/intern/source/pointdensity.c M source/blender/render/intern/source/render_texture.c M source/blender/windowmanager/intern/wm_draw.c M source/blender/windowmanager/intern/wm_files.c M source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c M source/blenderplayer/bad_level_call_stubs/stubs.c M source/tools M tests/gtests/alembic/abc_export_test.cc =================================================================== diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 8eec7c44928..95582b15d63 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -1282,8 +1282,8 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, else { /* TODO: fix point density to work with new view layer depsgraph */ #if 0 - /* We originally were passing view_layer here but in reality we need a whole EvaluationContext or at the - * very least a dpesgraph to pass to the RE_point_density_minmax() function. + /* We originally were passing view_layer here but in reality we need a + * a depsgraph to pass to the RE_point_density_minmax() function. */ /* TODO(sergey): Check we're indeed in shader node tree. */ PointerRNA ptr; diff --git a/release/datafiles/locale b/release/datafiles/locale index 469c949d1ca..d3349b42856 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 469c949d1ca882be19daa128842f813b72a944d8 +Subproject commit d3349b42856d00c278f72f2a5909a6c96b9cdb5e diff --git a/release/scripts/addons b/release/scripts/addons index c88411ff777..8f2fd7e23f0 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit c88411ff7776a2db5d6ef6117a1b2faa42a95611 +Subproject commit 8f2fd7e23f0b5ce023440182f51c40e88d663325 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 310578043de..34a27a42d78 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6 +Subproject commit 34a27a42d781d80f9f1833bad8cc5b2abcac2933 diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc index aa5d77ce4ec..4c91b9a6252 100644 --- a/source/blender/alembic/intern/abc_camera.cc +++ b/source/blender/alembic/intern/abc_camera.cc @@ -49,13 +49,13 @@ using Alembic::AbcGeom::kWrapExisting; /* ************************************************************************** */ -AbcCameraWriter::AbcCameraWriter(EvaluationContext *eval_ctx, +AbcCameraWriter::AbcCameraWriter(Depsgraph *depsgraph, Scene *scene, Object *ob, AbcTransformWriter *parent, uint32_t time_sampling, ExportSettings &settings) - : AbcObjectWriter(eval_ctx, scene, ob, time_sampling, settings, parent) + : AbcObjectWriter(depsgraph, scene, ob, time_sampling, settings, parent) { OCamera camera(parent->alembicXform(), m_name, m_time_sampling); m_camera_schema = camera.getSchema(); diff --git a/source/blender/alembic/intern/abc_camera.h b/source/blender/alembic/intern/abc_camera.h index 772b7a6aec6..a839ca947ca 100644 --- a/source/blender/alembic/intern/abc_camera.h +++ b/source/blender/alembic/intern/abc_camera.h @@ -35,7 +35,7 @@ class AbcCameraWriter : public AbcObjectWriter { Alembic::AbcGeom::OFloatProperty m_eye_separation; public: - AbcCameraWriter(EvaluationContext *eval_ctx, + AbcCameraWriter(Depsgraph *depsgraph, Scene *scene, Object *ob, AbcTransformWriter *parent, diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc index 5328c471093..41c1dacabc0 100644 --- a/source/blender/alembic/intern/abc_curves.cc +++ b/source/blender/alembic/intern/abc_curves.cc @@ -71,13 +71,13 @@ using Alembic::AbcGeom::OV2fGeomParam; /* ************************************************************************** */ -AbcCurveWriter::AbcCurveWriter(EvaluationContext *eval_ctx, +AbcCurveWriter::AbcCurveWriter(Depsgraph *depsgraph, Scene *scene, Object *ob, AbcTransformWriter *parent, uint32_t time_sampling, ExportSettings &settings) - : AbcObjectWriter(eval_ctx, scene, ob, time_sampling, settings, parent) + : AbcObjectWriter(depsgraph, scene, ob, time_sampling, settings, parent) { OCurves curves(parent->alembicXform(), m_name, m_time_sampling); m_schema = curves.getSchema(); diff --git a/source/blender/alembic/intern/abc_curves.h b/source/blender/alembic/intern/abc_curves.h index 73cc8b35e27..1e7180bbb1f 100644 --- a/source/blender/alembic/intern/abc_curves.h +++ b/source/blender/alembic/intern/abc_curves.h @@ -36,7 +36,7 @@ class AbcCurveWriter : public AbcObjectWriter { Alembic::AbcGeom::OCurvesSchema::Sample m_sample; public: - AbcCurveWriter(EvaluationContext *eval_ctx, + AbcCurveWriter(Depsgraph *depsgraph, Scene *scene, Object *ob, AbcTransformWriter *parent, diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index ed5b59d08e2..16c3f7f4e86 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -168,7 +168,7 @@ static bool export_object(const ExportSettings * const settings, const Base * co /* ************************************************************************** */ -AbcExporter::AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, +AbcExporter::AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer, Depsgraph *depsgraph, const char *filename, ExportSettings &settings) : m_bmain(bmain) @@ -176,8 +176,8 @@ AbcExporter::AbcExporter(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, , m_filename(filename) , m_trans_sampling_index(0) , m_shape_sampling_index(0) - , m_eval_ctx(eval_ctx) , m_scene(scene) + , m_view_layer(view_layer) , m_depsgraph(depsgraph) , m_writer(NULL) {} @@ -253,13 +253,13 @@ void AbcExporter::getFrameSet(unsigned int nr_of_samples, } } -void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled) +void AbcExporter::operator()(float &progress, bool &was_canceled) { std::string scene_name; - if (bmain->name[0] != '\0') { + if (m_bmain->name[0] != '\0') { char scene_file_name[FILE_MAX]; - BLI_strncpy(scene_file_name, bmain->name, FILE_MAX); + BLI_strncpy(scene_file_name, m_bmain->name, FILE_MAX); scene_name = scene_file_name; } else { @@ -298,8 +298,8 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled) OBox3dProperty archive_bounds_prop = Alembic::AbcGeom::CreateOArchiveBounds(m_writer->archive(), m_trans_sampling_index); - createTransformWritersHierarchy(bmain->eval_ctx); - createShapeWriters(bmain->eval_ctx); + createTransformWritersHierarchy(m_depsgraph); + createShapeWriters(m_depsgraph); /* Make a list of frames to export. */ @@ -332,7 +332,7 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled) const double frame = *begin; /* 'frame' is offset by start frame, so need to cancel the offset. */ - setCurrentFrame(bmain, frame); + setCurrentFrame(m_bmain, frame); if (shape_frames.count(frame) != 0) { for (int i = 0, e = m_shapes.size(); i != e; ++i) { @@ -361,7 +361,7 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled) } } -void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx) +void AbcExporter::createTransformWritersHierarchy(Depsgraph *depsgraph) { for (Base *base = static_cast<Base *>(m_settings.view_layer->object_bases.first); base; base = base->next) { Object *ob = base->object; @@ -374,13 +374,13 @@ void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx) /* We do not export transforms for objects of these classes. */ break; default: - exploreTransform(eval_ctx, base, ob->parent, NULL); + exploreTransform(depsgraph, base, ob->parent, NULL); } } } } -void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Base *ob_base, Object *parent, Object *dupliObParent) +void AbcExporter::exploreTransform(Depsgraph *depsgraph, Base *ob_base, Object *parent, Object *dupliObParent) { Object *ob = ob_base->object; @@ -391,10 +391,10 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Base *ob_base, O } if (object_type_is_exportable(m_scene, ob)) { - createTransformWriter(eval_ctx, ob, parent, dupliObParent); + createTransformWriter(depsgraph, ob, parent, dupliObParent); } - ListBase *lb = object_duplilist(eval_ctx, m_scene, ob); + ListBase *lb = object_duplilist(depsgraph, m_scene, ob); if (lb) { Base fake_base = *ob_base; // copy flags (like selection state) from the real object. @@ -415,7 +415,7 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Base *ob_base, O dupli_parent = (dupli_ob->parent) ? dupli_ob->parent : ob; fake_base.object = dupli_ob; - exploreTransform(eval_ctx, &fake_base, dupli_parent, ob); + exploreTransform(depsgraph, &fake_base, dupli_parent, ob); } } } @@ -423,7 +423,7 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Base *ob_base, O free_object_duplilist(lb); } -AbcTransformWriter * AbcExporter::createTransformWriter(EvaluationContext *eval_ctx, Object *ob, Object *parent, Object *dupliObParent) +AbcTransformWriter * AbcExporter::createTransformWriter(Depsgraph *depsgraph, Object *ob, Object *parent, Object *dupliObParent) { /* An object should not be its own parent, or we'll get infinite loops. */ BLI_assert(ob != parent); @@ -458,29 +458,29 @@ AbcTransformWriter * AbcExporter::createTransformWriter(EvaluationContext *eval_ * return the parent's AbcTransformWriter pointer. */ if (parent->parent) { if (parent == dupliObParent) { - parent_writer = createTransformWriter(eval_ctx, parent, parent->parent, NULL); + parent_writer = createTransformWriter(depsgraph, parent, parent->parent, NULL); } else { - parent_writer = createTransformWriter(eval_ctx, parent, parent->parent, dupliObParent); + parent_writer @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
