archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Adding const Scene* parameter in many areas.

Browse Source 
Related to {D15885} that requires scene parameter
to be added in many places. To speed up the review process
the adding of the scene parameter was added in a separate
patch.

Reviewed By: mont29

Maniphest Tasks: T73411

Differential Revision: https://developer.blender.org/D15930
This commit is contained in:
Monique Dewanchand
2022-09-14 21:30:20 +02:00
committed by Monique
parent 1a48548980
commit 23276bcc37
127 changed files with 1011 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/io/collada/SceneExporter.cpp
View File

@@ -82,11 +82,13 @@ void SceneExporter::writeNodeList(std::vector<Object *> &child_objects, Object *
void SceneExporter::writeNode(Object *ob)
{
const Scene *scene = blender_context.get_scene();
ViewLayer *view_layer = blender_context.get_view_layer();
std::vector<Object *> child_objects;
bc_get_children(child_objects, ob, view_layer);
bool can_export = bc_is_in_Export_set(this->export_settings.get_export_set(), ob, view_layer);
bc_get_children(child_objects, ob, scene, view_layer);
bool can_export = bc_is_in_Export_set(
this->export_settings.get_export_set(), ob, scene, view_layer);
/* Add associated armature first if available */
bool armature_exported = false;
@@ -94,7 +96,7 @@ void SceneExporter::writeNode(Object *ob)
if (ob_arm != nullptr) {
armature_exported = bc_is_in_Export_set(
this->export_settings.get_export_set(), ob_arm, view_layer);
this->export_settings.get_export_set(), ob_arm, scene, view_layer);
if (armature_exported && bc_is_marked(ob_arm)) {
writeNode(ob_arm);
bc_remove_mark(ob_arm);