oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into hashremoval

Browse Source
This commit is contained in:
itsmattkc
2022-05-23 11:44:12 -07:00
parent f124ad3178 d600d3acb8
commit de616afac2
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeparamview/nodeparamviewitem.cpp
+1 -3
View File
@@ -83,7 +83,7 @@ void NodeParamViewItem::Retranslate()
void NodeParamViewItem::RecreateBody()
{
QWidget *old_body = body_;
delete body_;
body_ = new NodeParamViewItemBody(node_, create_checkboxes_);
connect(body_, &NodeParamViewItemBody::RequestSelectNode, this, &NodeParamViewItem::RequestSelectNode);
@@ -95,8 +95,6 @@ void NodeParamViewItem::RecreateBody()
body_->SetTime(time_);
body_->SetTimebase(timebase_);
SetBody(body_);
old_body->deleteLater();
}
int NodeParamViewItem::GetElementY(const NodeInput &c) const
cmake/Sanitizers.cmake
+1 -1
View File
@@ -27,7 +27,7 @@ function(enable_sanitizers project_name)
endif()
option(ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" OFF)
if(ENABLE_SANITIZER_MEMORY AND CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if(ENABLE_SANITIZER_MEMORY AND (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"))
message(WARNING "Memory sanitizer requires all the code (including libc++) to be MSan-instrumented otherwise it reports false positives")
if("address" IN_LIST SANITIZERS
OR "thread" IN_LIST SANITIZERS