Skip to content

Commit

Permalink
project rename and re-configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
vicrucann committed May 9, 2016
1 parent d101cb7 commit f66eaea
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Project settings
project(dureu3d)
project(cherish)
cmake_minimum_required(VERSION 2.8.11)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "" FORCE)
Expand Down
2 changes: 1 addition & 1 deletion src/dureu3d/Settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ const float HUD_TEXT_POSY = HUD_BOTTOM + 15.f;
const float HUD_TEXT_POSZ = 0.f;

const size_t APP_SCREENSHOT_HEIGHT = 100;
const size_t APP_WIDGET_BUTTON = 24;
const size_t APP_WIDGET_BUTTON = 16;
const size_t APP_WIDGET_WIDTH = APP_SCREENSHOT_HEIGHT*2+150;

const int DelegateVisibilityRole = Qt::UserRole + 1;
Expand Down
2 changes: 1 addition & 1 deletion src/libSGControls/EventHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ void EventHandler::doEditPhotoPush(const osgGA::GUIEventAdapter &ea, osgGA::GUIA
if (!intersects) return;
entity::Photo* photo = this->getPhoto(*result);
if (!photo) return;
m_scene->editPhotoPush(photo);
// m_scene->editPhotoPush(photo);
}

template <typename T1, typename T2>
Expand Down

0 comments on commit f66eaea

Please sign in to comment.