Merged master into camera_struct - again

pencil2d · Jul 19, 2023 · 07a90d4 · 07a90d4
1 parent a91a40e
commit 07a90d4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 19 deletions.
diff --git a/app/src/timeline.cpp b/app/src/timeline.cpp
@@ -28,7 +28,6 @@ GNU General Public License for more details.
 #include <QWheelEvent>
 #include <QSlider>
 #include <QDebug>
-#include "layer.h"
 #include "editor.h"
 #include "layermanager.h"
 #include "timecontrols.h"

diff --git a/app/src/timelinecells.cpp b/app/src/timelinecells.cpp
@@ -236,17 +236,6 @@ void TimeLineCells::drawContent()
 
     QPainter painter(mCache);
 
-<<<<<<< HEAD:core_lib/src/interface/timelinecells.cpp
-    const Object* object = mEditor->object();
-
-    Q_ASSERT(object != nullptr);
-
-    const Layer* currentLayer = mEditor->layers()->currentLayer();
-//    qDebug() << currentLayer->name();
-    if (currentLayer == nullptr) return;
-
-=======
->>>>>>> master:app/src/timelinecells.cpp
     // grey background of the view
     const QPalette palette = QApplication::palette();
     painter.setPen(Qt::NoPen);
@@ -1114,10 +1103,7 @@ void TimeLineCells::mouseReleaseEvent(QMouseEvent* event)
 
             mEditor->layers()->notifyAnimationLengthChanged();
             emit mEditor->framesModified();
-<<<<<<< HEAD:core_lib/src/interface/timelinecells.cpp
-=======
             updateContent();
->>>>>>> master:app/src/timelinecells.cpp
         }
         else if (!mTimeLine->scrubbing && !mMovingFrames && !mClickSelecting && !mBoxSelecting)
         {
@@ -1127,10 +1113,7 @@ void TimeLineCells::mouseReleaseEvent(QMouseEvent* event)
             // Add/remove from already selected
             currentLayer->toggleFrameSelected(frameNumber, multipleSelection);
             emit mEditor->selectedFramesChanged();
-<<<<<<< HEAD:core_lib/src/interface/timelinecells.cpp
-=======
             updateContent();
->>>>>>> master:app/src/timelinecells.cpp
         }
     }
     if (mType == TIMELINE_CELL_TYPE::Layers && layerNumber != mStartLayerNumber && mStartLayerNumber != -1 && layerNumber != -1)

diff --git a/core_lib/core_lib.pro b/core_lib/core_lib.pro
@@ -195,7 +195,6 @@ SOURCES +=  src/graphics/bitmap/bitmapimage.cpp \
     src/selectionpainter.cpp \
 
 FORMS += \
-    ui/camerapropertiesdialog.ui \
     ui/layerpropertiesdialog.ui \
     ui/previewwindow.ui