Merge branch 'master' into 19616

Bennett Goble committed 12 years ago

Commit b634f8d2 parents 925270e e9286e537 files · +1267 −81Browse files

Showing the changes to interface/src/scripting/ClipboardScriptingInterface.cpp (1 of 37 files). Show all

Unified · Split

interface/src/scripting/ClipboardScriptingInterface.cpp+13−0

@@ -131,3 +131,16 @@ void ClipboardScriptingInterface::nudgeVoxel(float x, float y, float z, float s, · 130 unmodified lines
131		131
132	Application::getInstance()->nudgeVoxelsByVector(sourceVoxel, nudgeVecInTreeSpace);	132	Application::getInstance()->nudgeVoxelsByVector(sourceVoxel, nudgeVecInTreeSpace);
133	}	133	}
		134
		135
		136	bool ClipboardScriptingInterface::exportModels(const QString& filename, float x, float y, float z, float s) {
		137	return Application::getInstance()->exportModels(filename, x, y, z, s);
		138	}
		139
		140	bool ClipboardScriptingInterface::importModels(const QString& filename) {
		141	return Application::getInstance()->importModels(filename);
		142	}
		143
		144	void ClipboardScriptingInterface::pasteModels(float x, float y, float z, float s) {
		145	Application::getInstance()->pasteModels(x, y, z);
		146	}