Merge branch 'master' into blender2.8
This commit is contained in:
commit
0080878d67
3
extern/gflags/README.blender
vendored
3
extern/gflags/README.blender
vendored
@ -21,3 +21,6 @@ Local modifications:
|
||||
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/gflags.h
vendored
6
extern/gflags/src/gflags/gflags.h
vendored
@ -285,7 +285,11 @@ class GFLAGS_DLL_DECL FlagSaver {
|
||||
|
||||
FlagSaver(const FlagSaver&); // no copying!
|
||||
void operator=(const FlagSaver&);
|
||||
}__attribute((unused));
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
__attribute((unused))
|
||||
#endif
|
||||
;
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
// Some deprecated or hopefully-soon-to-be-deprecated functions.
|
||||
|
6
extern/glog/CMakeLists.txt
vendored
6
extern/glog/CMakeLists.txt
vendored
@ -23,7 +23,6 @@
|
||||
# ***** END GPL LICENSE BLOCK *****
|
||||
|
||||
set(INC
|
||||
src
|
||||
../gflags/src
|
||||
)
|
||||
|
||||
@ -71,8 +70,13 @@ if(WIN32)
|
||||
|
||||
list(APPEND INC
|
||||
src/windows
|
||||
src
|
||||
)
|
||||
else()
|
||||
list(APPEND INC
|
||||
src
|
||||
)
|
||||
|
||||
list(APPEND SRC
|
||||
src/demangle.cc
|
||||
src/signalhandler.cc
|
||||
|
2
extern/glog/src/config.h
vendored
2
extern/glog/src/config.h
vendored
@ -14,4 +14,6 @@
|
||||
#include "windows/config.h"
|
||||
#elif defined(__GNU__)
|
||||
#include "config_hurd.h"
|
||||
#elif defined(__HAIKU__)
|
||||
#include "config_haiku.h"
|
||||
#endif
|
||||
|
7
extern/glog/src/glog/logging.h
vendored
7
extern/glog/src/glog/logging.h
vendored
@ -33,6 +33,11 @@
|
||||
// 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_
|
||||
|
||||
@ -1623,3 +1628,5 @@ GOOGLE_GLOG_DLL_DECL void InstallFailureWriter(
|
||||
}
|
||||
|
||||
#endif // _LOGGING_H_
|
||||
|
||||
#endif // WIN32
|
||||
|
6
extern/glog/src/glog/raw_logging.h
vendored
6
extern/glog/src/glog/raw_logging.h
vendored
@ -33,6 +33,10 @@
|
||||
// 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_
|
||||
|
||||
@ -183,3 +187,5 @@ 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
vendored
6
extern/glog/src/glog/stl_logging.h
vendored
@ -44,6 +44,10 @@
|
||||
// - 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_
|
||||
|
||||
@ -218,3 +222,5 @@ inline void PrintSequence(std::ostream& out, Iter begin, Iter end) {
|
||||
namespace std { using ::operator<<; }
|
||||
|
||||
#endif // UTIL_GTL_STL_LOGGING_INL_H_
|
||||
|
||||
#endif // WIN32
|
||||
|
7
extern/glog/src/windows/config.h
vendored
7
extern/glog/src/windows/config.h
vendored
@ -1,5 +1,8 @@
|
||||
/* src/config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* define if you have google gflags library */
|
||||
#define HAVE_LIB_GFLAGS 1
|
||||
|
||||
/* Namespace for Google classes */
|
||||
#define GOOGLE_NAMESPACE google
|
||||
|
||||
@ -9,6 +12,10 @@
|
||||
/* Puts following code inside the Google namespace */
|
||||
#define _START_GOOGLE_NAMESPACE_ namespace google {
|
||||
|
||||
#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
|
||||
# define HAVE_SNPRINTF
|
||||
#endif
|
||||
|
||||
/* Always the empty-string on non-windows systems. On windows, should be
|
||||
"__declspec(dllexport)". This way, when we compile the dll, we export our
|
||||
functions/classes. It's safe to define this here because config.h is only
|
||||
|
2
extern/glog/src/windows/glog/logging.h
vendored
2
extern/glog/src/windows/glog/logging.h
vendored
@ -86,7 +86,7 @@
|
||||
#include <inttypes.h> // a third place for uint16_t or u_int16_t
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
#if 1
|
||||
#include <gflags/gflags.h>
|
||||
#endif
|
||||
|
||||
|
@ -584,6 +584,8 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, Panel):
|
||||
|
||||
if elem and elem.orig_width > 0 and elem.orig_height > 0:
|
||||
col.label(text=iface_("Original Dimension: %dx%d") % (elem.orig_width, elem.orig_height), translate=False)
|
||||
else:
|
||||
col.label(text="Original Dimension: None")
|
||||
|
||||
|
||||
class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
|
||||
|
Loading…
Reference in New Issue
Block a user