sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix compile on msvc (inline)

Browse Source
This commit is contained in:
Matt Ebb 2010-01-19 02:15:37 +00:00
parent aab8196a1c
commit b079dcc140
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_colortools.h
View File

@ -35,6 +35,16 @@ struct Histogram;
struct ImBuf;
struct rctf;
#if defined _WIN32
# define DO_INLINE __inline
#elif defined (__sgi)
# define DO_INLINE
#elif defined (__sun) || defined (__sun__)
# define DO_INLINE
#else
# define DO_INLINE static inline
#endif
typedef enum CurveMappingPreset {
CURVE_PRESET_LINE,
CURVE_PRESET_SHARP,

2
source/blender/blenkernel/intern/colortools.c
View File

@ -880,7 +880,7 @@ void curvemapping_table_RGBA(CurveMapping *cumap, float **array, int *size)
/* ***************** Histogram **************** */
static inline int get_bin_float(float f)
DO_INLINE int get_bin_float(float f)
{
CLAMP(f, 0.0, 1.0);