Merge branch 'master' into blender2.8

2018-07-30 15:39:12 +10:00 · 2018-07-30 15:39:12 +10:00 · 5f693d7442
parent 40ad0de002 9c960557a7
commit 5f693d7442
2 changed files with 5 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -62,6 +62,11 @@ if(NOT DEFINED CMAKE_BUILD_TYPE_INIT)
 	set(CMAKE_BUILD_TYPE_INIT "Release")
 endif()

+# Omit superfluous "Up-to-date" messages.
+if(NOT DEFINED CMAKE_INSTALL_MESSAGE)
+	set(CMAKE_INSTALL_MESSAGE "LAZY")
+endif()
+
 # quiet output for Makefiles, 'make -s' helps too
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)

--- a/source/blender/compositor/nodes/COM_CryptomatteNode.h
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h
@ -35,4 +35,3 @@ public:
 };

 #endif
-