Revision: 39033
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39033
Author: jwilkins
Date: 2011-08-04 18:28:51 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
Made conditions on C99 stuff for Visual Studio more precise since Visual Studio
2010 has better C99 compatibility
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
Modified:
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
===================================================================
---
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
2011-08-04 17:47:29 UTC (rev 39032)
+++
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_brushlib.cpp
2011-08-04 18:28:51 UTC (rev 39033)
@@ -69,7 +69,7 @@
static inline int g_rand_int(GRand *rng)
{
- return rng_getInt(rng);
+ return (rng_getInt(rng)*rng_getInt(rng)) & 0x8FFFFFFF;
}
static inline double g_rand_double(GRand *rng)
@@ -124,8 +124,8 @@
-/* C99 stuff missing from MSVC */
-#ifdef _MSC_VER
+/* C99 stuff missing from MSVC 2008 and earlier */
+#if _MSC_VER && _MSC_VER < 1600
#ifndef and
#define and &&
@@ -505,43 +505,43 @@
for (id= 0; id < BRUSH_SETTINGS_COUNT; id++) {
static const entry_t
id_table[BRUSH_SETTINGS_COUNT+1]= {
- { "opaque", BRUSH_OPAQUE },
- { "opaque_multiply",
BRUSH_OPAQUE_MULTIPLY },
- { "opaque_linearize",
BRUSH_OPAQUE_LINEARIZE },
- { "radius_logarithmic",
BRUSH_RADIUS_LOGARITHMIC },
- { "hardness", BRUSH_HARDNESS },
- { "dabs_per_basic_radius",
BRUSH_DABS_PER_BASIC_RADIUS },
- { "dabs_per_actual_radius",
BRUSH_DABS_PER_ACTUAL_RADIUS },
- { "dabs_per_second",
BRUSH_DABS_PER_SECOND },
- { "radius_by_random",
BRUSH_RADIUS_BY_RANDOM },
- { "speed1_slowness",
BRUSH_SPEED1_SLOWNESS },
- { "speed2_slowness",
BRUSH_SPEED2_SLOWNESS },
- { "speed1_gamma",
BRUSH_SPEED1_GAMMA },
- { "speed2_gamma",
BRUSH_SPEED2_GAMMA },
- { "offset_by_random",
BRUSH_OFFSET_BY_RANDOM },
- { "offset_by_speed",
BRUSH_OFFSET_BY_SPEED },
- { "offset_by_speed_slowness",
BRUSH_OFFSET_BY_SPEED_SLOWNESS },
- { "slow_tracking",
BRUSH_SLOW_TRACKING },
- { "slow_tracking_per_dab",
BRUSH_SLOW_TRACKING_PER_DAB },
- { "tracking_noise",
BRUSH_TRACKING_NOISE },
- { "color_h", BRUSH_COLOR_H },
- { "color_s", BRUSH_COLOR_S },
- { "color_v", BRUSH_COLOR_V },
- { "change_color_h",
BRUSH_CHANGE_COLOR_H },
- { "change_color_l",
BRUSH_CHANGE_COLOR_L },
- { "change_color_hsl_s",
BRUSH_CHANGE_COLOR_HSL_S },
- { "change_color_v",
BRUSH_CHANGE_COLOR_V },
- { "change_color_hsv_s",
BRUSH_CHANGE_COLOR_HSV_S },
- { "smudge", BRUSH_SMUDGE },
+ { "opaque", BRUSH_OPAQUE },
+ { "opaque_multiply",
BRUSH_OPAQUE_MULTIPLY },
+ { "opaque_linearize",
BRUSH_OPAQUE_LINEARIZE },
+ { "radius_logarithmic",
BRUSH_RADIUS_LOGARITHMIC },
+ { "hardness", BRUSH_HARDNESS },
+ { "dabs_per_basic_radius",
BRUSH_DABS_PER_BASIC_RADIUS },
+ { "dabs_per_actual_radius",
BRUSH_DABS_PER_ACTUAL_RADIUS },
+ { "dabs_per_second",
BRUSH_DABS_PER_SECOND },
+ { "radius_by_random",
BRUSH_RADIUS_BY_RANDOM },
+ { "speed1_slowness",
BRUSH_SPEED1_SLOWNESS },
+ { "speed2_slowness",
BRUSH_SPEED2_SLOWNESS },
+ { "speed1_gamma",
BRUSH_SPEED1_GAMMA },
+ { "speed2_gamma",
BRUSH_SPEED2_GAMMA },
+ { "offset_by_random",
BRUSH_OFFSET_BY_RANDOM },
+ { "offset_by_speed",
BRUSH_OFFSET_BY_SPEED },
+ { "offset_by_speed_slowness",
BRUSH_OFFSET_BY_SPEED_SLOWNESS },
+ { "slow_tracking",
BRUSH_SLOW_TRACKING },
+ { "slow_tracking_per_dab",
BRUSH_SLOW_TRACKING_PER_DAB },
+ { "tracking_noise",
BRUSH_TRACKING_NOISE },
+ { "color_h", BRUSH_COLOR_H },
+ { "color_s", BRUSH_COLOR_S },
+ { "color_v", BRUSH_COLOR_V },
+ { "change_color_h",
BRUSH_CHANGE_COLOR_H },
+ { "change_color_l",
BRUSH_CHANGE_COLOR_L },
+ { "change_color_hsl_s",
BRUSH_CHANGE_COLOR_HSL_S },
+ { "change_color_v",
BRUSH_CHANGE_COLOR_V },
+ { "change_color_hsv_s",
BRUSH_CHANGE_COLOR_HSV_S },
+ { "smudge", BRUSH_SMUDGE },
{ "smudge_radius_log",
BRUSH_SMUDGE_RADIUS_LOG },
- { "smudge_length",
BRUSH_SMUDGE_LENGTH },
- { "eraser", BRUSH_ERASER },
- { "stroke_threshold",
BRUSH_STROKE_THRESHOLD },
- { "stroke_treshold",
BRUSH_STROKE_THRESHOLD }, /* XXX: very common typo in myp files! */
- {
"stroke_duration_logarithmic", BRUSH_STROKE_DURATION_LOGARITHMIC },
- { "stroke_holdtime",
BRUSH_STROKE_HOLDTIME },
- { "custom_input",
BRUSH_CUSTOM_INPUT },
- { "custom_input_slowness",
BRUSH_CUSTOM_INPUT_SLOWNESS },
+ { "smudge_length",
BRUSH_SMUDGE_LENGTH },
+ { "eraser", BRUSH_ERASER },
+ { "stroke_threshold",
BRUSH_STROKE_THRESHOLD },
+ { "stroke_treshold",
BRUSH_STROKE_THRESHOLD }, /* XXX: very common typo in myp files! */
+ {
"stroke_duration_logarithmic", BRUSH_STROKE_DURATION_LOGARITHMIC },
+ { "stroke_holdtime",
BRUSH_STROKE_HOLDTIME },
+ { "custom_input",
BRUSH_CUSTOM_INPUT },
+ { "custom_input_slowness",
BRUSH_CUSTOM_INPUT_SLOWNESS },
{ "elliptical_dab_ratio",
BRUSH_ELLIPTICAL_DAB_RATIO },
{ "elliptical_dab_angle",
BRUSH_ELLIPTICAL_DAB_ANGLE },
{ "direction_filter",
BRUSH_DIRECTION_FILTER },
@@ -865,7 +865,7 @@
float radius2d)
{
Brush* brush= reinterpret_cast<Brush *>(brushlib_brush);
- brush->set_base_value(BRUSH_RADIUS_LOGARITHMIC, logf(radius2d));
+ brush->set_base_value(BRUSH_RADIUS_LOGARITHMIC, logf(0.15f*radius2d));
}
void paint_brushlib_set_color(
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
