X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fbrushmodule.cpp;h=66e7a3109062a758e79cf71719d4ad8d942259d9;hp=e289f3ccb1e161f1bfa58be1f61043f99170b42d;hb=4e142f7d8761aa8506ba5efd6f8a270d4b7dcf6c;hpb=6ee91d153ea09f2dafa62ed2f022f4183c090168 diff --git a/radiant/brushmodule.cpp b/radiant/brushmodule.cpp index e289f3cc..66e7a310 100644 --- a/radiant/brushmodule.cpp +++ b/radiant/brushmodule.cpp @@ -131,8 +131,6 @@ void Brush_Construct(EBrushType type) } } - FaceTextureClipboard_setDefault(); - GlobalPreferenceSystem().registerPreference("TextureLock", BoolImportStringCaller(g_brush_texturelock_enabled), BoolExportStringCaller(g_brush_texturelock_enabled)); GlobalPreferenceSystem().registerPreference("BrushSnapPlanes", makeBoolStringImportCallback(FaceImportSnapPlanesCaller()), makeBoolStringExportCallback(FaceExportSnapPlanesCaller())); GlobalPreferenceSystem().registerPreference("TexdefDefaultScale", FloatImportStringCaller(g_texdef_default_scale), FloatExportStringCaller(g_texdef_default_scale)); @@ -184,12 +182,13 @@ public: { return g_useAlternativeTextureProjection.m_value; } - void forEachBrushFace(scene::Node& brush, const BrushFaceDataCallback& callback) + void Brush_forEachFace(scene::Node& brush, const BrushFaceDataCallback& callback) { - Brush_forEachFace(*Node_getBrush(brush), FaceCallback(BrushFaceDataFromFaceCaller(callback))); + ::Brush_forEachFace(*Node_getBrush(brush), FaceCallback(BrushFaceDataFromFaceCaller(callback))); } - bool addBrushFace(scene::Node& brush, const _QERFaceData& faceData) + bool Brush_addFace(scene::Node& brush, const _QERFaceData& faceData) { + Node_getBrush(brush)->undoSave(); return Node_getBrush(brush)->addPlane(faceData.m_p0, faceData.m_p1, faceData.m_p2, faceData.m_shader, TextureProjection(faceData.m_texdef, brushprimit_texdef_t(), Vector3(0, 0, 0), Vector3(0, 0, 0))) != 0; } };