Pre-merge rename of RenderablePicoModel to StaticModel

Do the rename explicitly in advance of the merge to avoid confusing Git when it tries to merge in changes to files which have been both renamed and moved.
codereader · Nov 27, 2020 · 4645016 · 4645016
1 parent f657e3d
commit 4645016
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 0 deletions.
diff --git a/...e/model/picomodel/RenderablePicoModel.cpp → radiantcore/model/picomodel/StaticModel.cpp b/...e/model/picomodel/RenderablePicoModel.cpp → radiantcore/model/picomodel/StaticModel.cpp
diff --git a/...ore/model/picomodel/RenderablePicoModel.h → radiantcore/model/picomodel/StaticModel.h b/...ore/model/picomodel/RenderablePicoModel.h → radiantcore/model/picomodel/StaticModel.h
diff --git a/...antcore/model/picomodel/PicoModelNode.cpp → ...tcore/model/picomodel/StaticModelNode.cpp b/...antcore/model/picomodel/PicoModelNode.cpp → ...tcore/model/picomodel/StaticModelNode.cpp
diff --git a/radiantcore/model/picomodel/PicoModelNode.h → ...antcore/model/picomodel/StaticModelNode.h b/radiantcore/model/picomodel/PicoModelNode.h → ...antcore/model/picomodel/StaticModelNode.h
diff --git a/...model/picomodel/RenderablePicoSurface.cpp → ...re/model/picomodel/StaticModelSurface.cpp b/...model/picomodel/RenderablePicoSurface.cpp → ...re/model/picomodel/StaticModelSurface.cpp
diff --git a/...e/model/picomodel/RenderablePicoSurface.h → ...core/model/picomodel/StaticModelSurface.h b/...e/model/picomodel/RenderablePicoSurface.h → ...core/model/picomodel/StaticModelSurface.h