Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Mar 2018 14:25:27 +0000 (15:25 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Mar 2018 14:25:27 +0000 (15:25 +0100)
19 files changed:
CMakeLists.txt
extern/ceres/CMakeLists.txt
extern/ceres/bundle.sh
extern/gflags/README.blender
extern/gflags/src/gflags.cc
extern/gflags/src/gflags_completions.cc
extern/glog/CMakeLists.txt
extern/glog/README.blender
extern/glog/include/glog/log_severity.h [moved from extern/glog/src/glog/log_severity.h with 100% similarity]
extern/glog/include/glog/logging.h [moved from extern/glog/src/glog/logging.h with 99% similarity]
extern/glog/include/glog/raw_logging.h [moved from extern/glog/src/glog/raw_logging.h with 98% similarity]
extern/glog/include/glog/stl_logging.h [moved from extern/glog/src/glog/stl_logging.h with 98% similarity]
extern/glog/include/glog/vlog_is_on.h [moved from extern/glog/src/glog/vlog_is_on.h with 100% similarity]
extern/glog/src/windows/glog/logging.h
intern/cycles/util/util_logging.h
intern/libmv/CMakeLists.txt
intern/libmv/bundle.sh
intern/libmv/intern/logging.cc
source/blender/makesrna/intern/rna_space.c

index d45cfefcb78c03565f40b365d247888a5fb8dcf8..0d9d06b398972d02b28a80855c63de22177d8acb 100644 (file)
@@ -1241,7 +1241,7 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
                if(WIN32)
                        set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src/windows)
                else()
-                       set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src)
+                       set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/include)
                endif()
        endif()
 endif()
@@ -1378,6 +1378,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
        # flags to undo strict flags
        ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
        ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION         -Wno-unused-function)
 
        if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
                ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
index a6e9cd9c356d6b17fd6f542a1786d72e387262af..82695133a15be59b94ea3280b42e0d5c86e9d424 100644 (file)
@@ -36,6 +36,8 @@ set(INC
 
 set(INC_SYS
        ${EIGEN3_INCLUDE_DIRS}
+       ${GFLAGS_INCLUDE_DIRS}
+       ${GLOG_INCLUDE_DIRS}
 )
 
 set(SRC
@@ -303,16 +305,6 @@ else()
        add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION)
 endif()
 
-if(WIN32)
-       list(APPEND INC
-               ../glog/src/windows
-       )
-else()
-       list(APPEND INC
-               ../glog/src
-       )
-endif()
-
 add_definitions(${GFLAGS_DEFINES})
 add_definitions(${GLOG_DEFINES})
 add_definitions(${CERES_DEFINES})
index a4f703ac33d5c8952e05f9daf409503eb74715df..1c9a2e729e589d59a9469bbc98bbf47c3345672c 100755 (executable)
@@ -129,6 +129,8 @@ set(INC
 
 set(INC_SYS
        \${EIGEN3_INCLUDE_DIRS}
+       \${GFLAGS_INCLUDE_DIRS}
+       \${GLOG_INCLUDE_DIRS}
 )
 
 set(SRC
@@ -145,16 +147,6 @@ else()
        add_definitions(-DCERES_RESTRICT_SCHUR_SPECIALIZATION)
 endif()
 
-if(WIN32)
-       list(APPEND INC
-               ../glog/src/windows
-       )
-else()
-       list(APPEND INC
-               ../glog/src
-       )
-endif()
-
 add_definitions(\${GFLAGS_DEFINES})
 add_definitions(\${GLOG_DEFINES})
 add_definitions(\${CERES_DEFINES})
index 68dba11432932aea352705e657b3a4385d77f125..c57f5ce53ca0873e2dc4be47393ce5473f5863c8 100644 (file)
@@ -17,10 +17,5 @@ Local modifications:
 - Applied some modifications from fork https://github.com/Nazg-Gul/gflags.git
   (see https://github.com/gflags/gflags/pull/129)
 
-- Made `google::{anonymous}::FlagValue::ValueSize() const` inlined, so it does
-  not trigger strict compiler warning.
-
-- Did the same for CommandLineFlagParser::ValidateFlags().
-
 - Ifdef-ed __attribute((unused)) in gflags.h.
   This file is compile-time configurable in upstream, so can not avoid change here.
index 60965d3d201cddd1a9a1748a384744cf56355d77..f27079862f0613527c97504c07d8887fef67db5e 100644 (file)
@@ -225,7 +225,7 @@ class FlagValue {
   bool Equal(const FlagValue& x) const;
   FlagValue* New() const;   // creates a new one with default value
   void CopyFrom(const FlagValue& x);
-  inline int ValueSize() const;
+  int ValueSize() const;
 
   // Calls the given validate-fn on value_buffer_, and returns
   // whatever it returns.  But first casts validate_fn_proto to a
@@ -485,7 +485,7 @@ void FlagValue::CopyFrom(const FlagValue& x) {
   }
 }
 
-inline int FlagValue::ValueSize() const {
+int FlagValue::ValueSize() const {
   if (type_ > FV_MAX_INDEX) {
     assert(false);  // unknown type
     return 0;
@@ -1257,7 +1257,7 @@ void CommandLineFlagParser::ValidateFlags(bool all) {
   }
 }
 
-inline void CommandLineFlagParser::ValidateAllFlags() {
+void CommandLineFlagParser::ValidateAllFlags() {
   ValidateFlags(true);
 }
 
index c663453c59c8247e59d895777fc41b1379c8ca92..f7724864d5881b6b2b508931bc647cbaa545d56b 100644 (file)
@@ -55,8 +55,6 @@
 #include <utility>
 #include <vector>
 
-#include "gflags_completions.h"
-
 #include "config.h"
 #include "gflags/gflags.h"
 #include "gflags/gflags_completions.h"
index 59833151e4e443862678c59fc1c723cc61e5669f..df64718ee95c6024fe69eab70cc6fde0cc87c934 100644 (file)
@@ -23,6 +23,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
+       src
        ../gflags/src
 )
 
@@ -70,24 +71,23 @@ if(WIN32)
 
        list(APPEND INC
                src/windows
-               src
        )
 else()
        list(APPEND INC
-               src
+               include
        )
-
        list(APPEND SRC
                src/demangle.cc
                src/signalhandler.cc
                src/symbolize.cc
 
                src/demangle.h
-               src/glog/logging.h
-               src/glog/log_severity.h
-               src/glog/raw_logging.h
-               src/glog/vlog_is_on.h
                src/symbolize.h
+
+               include/glog/logging.h
+               include/glog/log_severity.h
+               include/glog/raw_logging.h
+               include/glog/vlog_is_on.h
        )
 endif()
 
index c48bc468e4cd5d7ed89f48c1930b43e808465deb..38d5ff05c863e8e9812e0880b24aad7e93972c14 100644 (file)
@@ -5,3 +5,5 @@ Upstream version: 0.3.5, a6a166db069
 Local modifications:
 * Added per-platform config.h files so no configuration-time
   checks for functions and so are needed.
+* Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS
+  in Windows' specific config.h.
similarity index 99%
rename from extern/glog/src/glog/logging.h
rename to extern/glog/include/glog/logging.h
index 7aac880a9525ee22224e7aba231ae2863b338ca0..8238ca9610fc7ba341add5591bfb426baa897931 100644 (file)
 // Pretty much everybody needs to #include this file so that they can
 // log various happenings.
 //
-
-#ifdef WIN32
-#  include "windows/glog/logging.h"
-#else  // WIN32
-
 #ifndef _LOGGING_H_
 #define _LOGGING_H_
 
@@ -1628,5 +1623,3 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
 }
 
 #endif // _LOGGING_H_
-
-#endif  // WIN32
similarity index 98%
rename from extern/glog/src/glog/raw_logging.h
rename to extern/glog/include/glog/raw_logging.h
index b030f7f736d78d9f7c8d78c0c50397e6ed4cb06f..65278f62803f4782c3c7c7cc286fcc9d6389b670 100644 (file)
 // acquire any locks, and can therefore be used by low-level memory
 // allocation and synchronization code.
 
-#ifdef WIN32
-#  include "windows/glog/raw_logging.h"
-#else  // WIN32
-
 #ifndef BASE_RAW_LOGGING_H_
 #define BASE_RAW_LOGGING_H_
 
@@ -187,5 +183,3 @@ GOOGLE_GLOG_DLL_DECL void RawLog__SetLastTime(const struct tm& t, int usecs);
 }
 
 #endif  // BASE_RAW_LOGGING_H_
-
-#endif  // WIN32
similarity index 98%
rename from extern/glog/src/glog/stl_logging.h
rename to extern/glog/include/glog/stl_logging.h
index bd0001527389e9ac7ffb8a796050c0b8f7b72c96..40a15aa457803be13315cb2411bf8aaeef107528 100644 (file)
 // - GLOG_STL_LOGGING_FOR_EXT_SLIST     - <ext/slist>
 //
 
-#ifdef WIN32
-#  include "windows/glog/stl_logging.h"
-#else  // WIN32
-
 #ifndef UTIL_GTL_STL_LOGGING_INL_H_
 #define UTIL_GTL_STL_LOGGING_INL_H_
 
@@ -222,5 +218,3 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) {
 namespace std { using ::operator<<; }
 
 #endif  // UTIL_GTL_STL_LOGGING_INL_H_
-
-#endif  // WIN32
index 606831f211c50cc47ab3b8726e65f1a42d78c3df..f521a2b9424d34677c86255178fbfc41525ad784 100644 (file)
@@ -86,7 +86,7 @@
 #include <inttypes.h>           // a third place for uint16_t or u_int16_t
 #endif
 
-#if 1
+#if 0
 #include <gflags/gflags.h>
 #endif
 
index 492f830e67cc9b29619d985c1a9cda67b7657eeb..5c84b6593d3b0153f1c5e145faa832e457e16aba 100644 (file)
@@ -18,6 +18,7 @@
 #define __UTIL_LOGGING_H__
 
 #if defined(WITH_CYCLES_LOGGING) && !defined(__KERNEL_GPU__)
+#  include <gflags/gflags.h>
 #  include <glog/logging.h>
 #endif
 
index b67a23b415929b411550ed03f2a0008f268fafb6..bc555fa7ff606ebe34be6dc6c90f9a0c39563c29 100644 (file)
@@ -45,7 +45,7 @@ if(WITH_LIBMV)
 
        list(APPEND INC
                ${GFLAGS_INCLUDE_DIRS}
-               ../../extern/glog/src
+               ${GLOG_INCLUDE_DIRS}
                ../../extern/ceres/include
                ../../extern/ceres/config
                ../guardedalloc
index d155d0507823e55bc24556ec62e96a33ceaddce6..093095f5f5cfa8e990cefbae02e4857b9f6fbd2c 100755 (executable)
@@ -124,7 +124,7 @@ if(WITH_LIBMV)
 
        list(APPEND INC
                \${GFLAGS_INCLUDE_DIRS}
-               ../../extern/glog/src
+               \${GLOG_INCLUDE_DIRS}
                ../../extern/ceres/include
                ../../extern/ceres/config
                ../guardedalloc
index 863832cb72bfe01c6316f4da80c6e4009b971d50..701881b3971ef87869d7dd4b27b03a4b759b6ac6 100644 (file)
@@ -24,6 +24,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <gflags/gflags.h>
+
 #include "intern/logging.h"
 #include "intern/utildefines.h"
 #include "libmv/logging/logging.h"
index c95b33d90ad8daae81c811c0b51b21c96302ec01..70ec6287924f310ae507cd15eb3bb87390a0d048 100644 (file)
 const EnumPropertyItem rna_enum_space_type_items[] = {
        /* empty must be here for python, is skipped for UI */
        {SPACE_EMPTY, "EMPTY", ICON_NONE, "Empty", ""},
+
+       /* General */
+       {0, "", ICON_NONE, "General", ""},
        {SPACE_VIEW3D, "VIEW_3D", ICON_VIEW3D, "3D View", "3D viewport"},
-       {0, "", ICON_NONE, NULL, NULL},
+       {SPACE_IMAGE, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", "View and edit images and UV Maps"},
+       {SPACE_NODE, "NODE_EDITOR", ICON_NODETREE, "Node Editor", "Editor for node-based shading and compositing tools"},
+       {SPACE_SEQ, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequencer", "Video editing tools"},
+       {SPACE_CLIP, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", "Motion tracking tools"},
+
+       /* Animation */
+       {0, "", ICON_NONE, "Animation", ""},
        {SPACE_TIME, "TIMELINE", ICON_TIME, "Timeline", "Timeline and playback controls"},
        {SPACE_IPO, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", "Edit drivers and keyframe interpolation"},
        {SPACE_ACTION, "DOPESHEET_EDITOR", ICON_ACTION, "Dope Sheet", "Adjust timing of keyframes"},
        {SPACE_NLA, "NLA_EDITOR", ICON_NLA, "NLA Editor", "Combine and layer Actions"},
-       {0, "", ICON_NONE, NULL, NULL},
-       {SPACE_IMAGE, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", "View and edit images and UV Maps"},
-       {SPACE_CLIP, "CLIP_EDITOR", ICON_CLIP, "Movie Clip Editor", "Motion tracking tools"},
-       {SPACE_SEQ, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequence Editor", "Video editing tools"},
-       {SPACE_NODE, "NODE_EDITOR", ICON_NODETREE, "Node Editor", "Editor for node-based shading and compositing tools"},
+
+       /* Scripting */
+       {0, "", ICON_NONE, "Scripting", ""},
        {SPACE_TEXT, "TEXT_EDITOR", ICON_TEXT, "Text Editor", "Edit scripts and in-file documentation"},
        {SPACE_LOGIC, "LOGIC_EDITOR", ICON_LOGIC, "Logic Editor", "Game logic editing"},
-       {0, "", ICON_NONE, NULL, NULL},
-       {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", "Edit properties of active object and related data-blocks"},
+       {SPACE_CONSOLE, "CONSOLE", ICON_CONSOLE, "Python Console", "Interactive programmatic console for "
+                       "advanced editing and script development"},
+       {SPACE_INFO, "INFO", ICON_INFO, "Info", "Main menu bar and list of error messages "
+                    "(drag down to expand and display)"},
+
+       /* Data */
+       {0, "", ICON_NONE, "Data", ""},
        {SPACE_OUTLINER, "OUTLINER", ICON_OOPS, "Outliner", "Overview of scene graph and all available data-blocks"},
-       {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", "Edit persistent configuration settings"},
-       {SPACE_INFO, "INFO", ICON_INFO, "Info", "Main menu bar and list of error messages (drag down to expand and display)"},
-       {0, "", ICON_NONE, NULL, NULL},
+       {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", "Edit properties of active object and related data-blocks"},
        {SPACE_FILE, "FILE_BROWSER", ICON_FILESEL, "File Browser", "Browse for files and assets"},
-       {0, "", ICON_NONE, NULL, NULL},
-       {SPACE_CONSOLE, "CONSOLE", ICON_CONSOLE, "Python Console", "Interactive programmatic console for advanced editing and script development"},
+       {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences",
+                        "Edit persistent configuration settings"},
        {0, NULL, 0, NULL, NULL}
 };