Differential D4875 Diff 15389 source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

Changeset View

Standalone View

Show All 17 Lines
* \ingroup freestyle		* \ingroup freestyle
*/		*/

#include "BlenderFileLoader.h"		#include "BlenderFileLoader.h"

#include "BLI_utildefines.h"		#include "BLI_utildefines.h"

#include "BKE_global.h"		#include "BKE_global.h"
		#include "BKE_object.h"

#include <sstream>		#include <sstream>

namespace Freestyle {		namespace Freestyle {

BlenderFileLoader::BlenderFileLoader(Render re, ViewLayer view_layer, Depsgraph *depsgraph)		BlenderFileLoader::BlenderFileLoader(Render re, ViewLayer view_layer, Depsgraph *depsgraph)
{		{
_re = re;		_re = re;
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines	DEG_OBJECT_ITER_BEGIN (_depsgraph,
if (_pRenderMonitor && _pRenderMonitor->testBreak()) {		if (_pRenderMonitor && _pRenderMonitor->testBreak()) {
break;		break;
}		}

if (ob->base_flag & (BASE_HOLDOUT \| BASE_INDIRECT_ONLY)) {		if (ob->base_flag & (BASE_HOLDOUT \| BASE_INDIRECT_ONLY)) {
continue;		continue;
}		}

Mesh *mesh = BKE_mesh_new_from_object(_re->main, ob);		Mesh *mesh = BKE_object_to_mesh(ob);

if (mesh) {		if (mesh) {
insertShapeNode(ob, mesh, ++id);		insertShapeNode(ob, mesh, ++id);
BKE_id_free_ex(_re->main, &mesh->id, LIB_ID_FREE_NO_UI_USER, true);		BKE_object_to_mesh_clear(ob);
}		}
}		}
DEG_OBJECT_ITER_END;		DEG_OBJECT_ITER_END;

// Return the built scene.		// Return the built scene.
return _Scene;		return _Scene;
}		}

▲ Show 20 Lines • Show All 676 Lines • Show Last 20 Lines