tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2018-03-23 15:25:27 +01:00
parent 8eb8aa4939 4f8e407086
commit 21f16bb93e
19 changed files with 47 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View 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)

12
extern/ceres/CMakeLists.txt vendored
View 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})

12
extern/ceres/bundle.sh vendored
View File

@ -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})

5
extern/gflags/README.blender vendored
View 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.

6
extern/gflags/src/gflags.cc vendored
View 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);
}

2
extern/gflags/src/gflags_completions.cc vendored
View 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"

14
extern/glog/CMakeLists.txt vendored
View 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()

2
extern/glog/README.blender vendored
View 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.

0
extern/glog/src/glog/log_severity.h → extern/glog/include/glog/log_severity.h vendored
View File

7
extern/glog/src/glog/logging.h → extern/glog/include/glog/logging.h vendored
View File

@ -33,11 +33,6 @@
// 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

6
extern/glog/src/glog/raw_logging.h → extern/glog/include/glog/raw_logging.h vendored
View File

@ -33,10 +33,6 @@
// 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

6
extern/glog/src/glog/stl_logging.h → extern/glog/include/glog/stl_logging.h vendored
View File

@ -44,10 +44,6 @@
// - 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

0
extern/glog/src/glog/vlog_is_on.h → extern/glog/include/glog/vlog_is_on.h vendored
View File

2
extern/glog/src/windows/glog/logging.h vendored
View 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

1
intern/cycles/util/util_logging.h
View 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

2
intern/libmv/CMakeLists.txt
View 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

2
intern/libmv/bundle.sh
View File

@ -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

2
intern/libmv/intern/logging.cc
View 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"

36
source/blender/makesrna/intern/rna_space.c
View File

@ -64,28 +64,38 @@
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}
};