Commit: 56f47431f258de288fa4adcd2b40fec0d6e3af46
Author: Sergey Sharybin
Date: Mon Mar 16 14:51:52 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB56f47431f258de288fa4adcd2b40fec0d6e3af46
Depsgraph: Make branch closer to master
===================================================================
M build_files/scons/config/linux-config.py
M build_files/scons/config/win64-mingw-config.py
M extern/clew/include/clew.h
M intern/cycles/util/util_types.h
M intern/ghost/intern/GHOST_WindowWin32.h
M release/scripts/startup/bl_operators/anim.py
M source/blender/blenkernel/intern/blender.c
===================================================================
diff --git a/build_files/scons/config/linux-config.py
b/build_files/scons/config/linux-config.py
index ec938d7..455dd23 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -235,7 +235,7 @@ CXXFLAGS = []
CPPFLAGS = []
# g++ 4.6, only needed for bullet
-CXXFLAGS += ['-fpermissive', '-std=c++11', '-U__STRICT_ANSI__']
+CXXFLAGS += ['-fpermissive']
if WITH_BF_FFMPEG:
# libavutil needs UINT64_C()
CXXFLAGS += ['-D__STDC_CONSTANT_MACROS', ]
diff --git a/build_files/scons/config/win64-mingw-config.py
b/build_files/scons/config/win64-mingw-config.py
index bba1dd7..57eaae8 100644
--- a/build_files/scons/config/win64-mingw-config.py
+++ b/build_files/scons/config/win64-mingw-config.py
@@ -181,7 +181,7 @@ CC = 'gcc'
CXX = 'g++'
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-CXXFLAGS = [ '-fpermissive', '-std=c++11' ]
+CXXFLAGS = [ '-fpermissive' ]
CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64',
'-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE',
'-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-DOPJ_STATIC']
REL_CFLAGS = []
diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h
index 6265eb1..328fd52 100644
--- a/extern/clew/include/clew.h
+++ b/extern/clew/include/clew.h
@@ -505,14 +505,14 @@ typedef unsigned int cl_GLenum;
#endif
/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */
-//#if (defined( __GNUC__) && ! defined( __STRICT_ANSI__ )) || (defined(
_MSC_VER ) && ! defined( __STDC__ ))
+#if (defined( __GNUC__) && ! defined( __STRICT_ANSI__ )) || (defined( _MSC_VER
) && ! defined( __STDC__ ))
/* .xyzw and .s0123...{f|F} are supported */
#define CL_HAS_NAMED_VECTOR_FIELDS 1
/* .hi and .lo are supported */
#define CL_HAS_HI_LO_VECTOR_FIELDS 1
#define CL_NAMED_STRUCT_SUPPORTED
-//#endif
+#endif
#if defined( CL_NAMED_STRUCT_SUPPORTED) && defined( _MSC_VER )
#define __extension__ __pragma(warning(suppress:4201))
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h
index bb17126..0c4c1f1 100644
--- a/intern/cycles/util/util_types.h
+++ b/intern/cycles/util/util_types.h
@@ -498,21 +498,15 @@ template<typename T> static inline T decltype_helper(T x)
{ return x; }
/* Causes warning:
* incompatible types when assigning to type 'Foo' from type 'Bar'
* ... the compiler optimizes away the temp var */
-#if defined(__GNUC__)
-# if __cplusplus > 199711L
-# define DECLTYPE(x) decltype(x)
-# else
-# define DECLTYPE(x) typeof(x)
-# endif
-
+#ifdef __GNUC__
#define CHECK_TYPE(var, type) { \
- DECLTYPE(var) *__tmp; \
+ TYPEOF(var) *__tmp; \
__tmp = (type *)NULL; \
(void)__tmp; \
} (void)0
#define CHECK_TYPE_PAIR(var_a, var_b) { \
- DECLTYPE(var_a) *__tmp; \
+ TYPEOF(var_a) *__tmp; \
__tmp = (typeof(var_b) *)NULL; \
(void)__tmp; \
} (void)0
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h
b/intern/ghost/intern/GHOST_WindowWin32.h
index 3a9b152..1eaef24 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -197,6 +197,8 @@ public:
GHOST_TSuccess setOrder(GHOST_TWindowOrder order);
/**
+
+ /**
* Invalidates the contents of this window.
*/
GHOST_TSuccess invalidate();
diff --git a/release/scripts/startup/bl_operators/anim.py
b/release/scripts/startup/bl_operators/anim.py
index 10a9c02..1ac048e 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -104,10 +104,10 @@ class ANIM_OT_keying_set_export(Operator):
"""
- idtype_list is used to get the list of id-datablocks from
- bpy.data.* since this info isn't available elsewhere
+ bpy.data.* since this info isn't available elsewhere
- id.bl_rna.name gives a name suitable for UI,
- with a capitalised first letter, but we need
- the plural form that's all lower case
+ with a capitalised first letter, but we need
+ the plural form that's all lower case
"""
idtype_list = ksp.id.bl_rna.name.lower() + "s"
@@ -215,8 +215,8 @@ class BakeAction(Operator):
description="Which data's transformations to bake",
options={'ENUM_FLAG'},
items=(('POSE', "Pose", "Bake bones transformations"),
- ('OBJECT', "Object", "Bake object transformations"),
- ),
+ ('OBJECT', "Object", "Bake object transformations"),
+ ),
default={'POSE'},
)
@@ -284,7 +284,7 @@ class ClearUselessActions(Operator):
removed += 1
self.report({'INFO'}, "Removed %d empty and/or fake-user only Actions"
- % removed)
+ % removed)
return {'FINISHED'}
diff --git a/source/blender/blenkernel/intern/blender.c
b/source/blender/blenkernel/intern/blender.c
index ba60369..b6ea780 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -80,8 +80,6 @@
#include "BKE_sequencer.h"
#include "BKE_sound.h"
-#include "DEG_depsgraph.h"
-
#include "RE_pipeline.h"
#include "RE_render_ext.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
