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

3
source/blender/io/collada/collada.cpp
View File

@@ -58,6 +58,7 @@ int collada_import(bContext *C, ImportSettings *import_settings)
int collada_export(bContext *C, ExportSettings *export_settings)
{
BlenderContext blender_context(C);
const Scene *scene = blender_context.get_scene();
ViewLayer *view_layer = blender_context.get_view_layer();
int includeFilter = OB_REL_NONE;
@@ -73,7 +74,7 @@ int collada_export(bContext *C, ExportSettings *export_settings)
*/
eObjectSet objectSet = (export_settings->selected) ? OB_SET_SELECTED : OB_SET_ALL;
export_settings->export_set = BKE_object_relational_superset(
view_layer, objectSet, (eObRelationTypes)includeFilter);
scene, view_layer, objectSet, (eObRelationTypes)includeFilter);
int export_count = BLI_linklist_count(export_settings->export_set);