[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42968] branches/bmesh/blender: svn merge ^/trunk/blender -r42957:42967
Campbell Barton
ideasman42 at gmail.com
Thu Dec 29 07:45:00 CET 2011
Revision: 42968
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42968
Author: campbellbarton
Date: 2011-12-29 06:44:51 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42957:42967
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42957
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/bmesh/blender/intern/cycles/kernel/svm/svm_hsv.h
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42957
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42967
Modified: branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py 2011-12-29 06:32:50 UTC (rev 42967)
+++ branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py 2011-12-29 06:44:51 UTC (rev 42968)
@@ -156,15 +156,15 @@
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/gcc/openimageio'
-BF_OIIO_INC = '#../lib/windows/gcc/openimageio/include'
+BF_OIIO_INC = BF_OIIO + '/include'
BF_OIIO_LIB = 'OpenImageIO'
-BF_OIIO_LIBPATH = '#../lib/windows/gcc/openimageio/lib'
+BF_OIIO_LIBPATH = BF_OIIO + '/lib'
WITH_BF_BOOST = True
BF_BOOST = LIBDIR + '/boost'
-BF_BOOST_INC = '#../lib/windows/boost/include'
+BF_BOOST_INC = BF_BOOST + '/include'
BF_BOOST_LIB = 'boost_date_time-mgw45-mt-s-1_47 boost_filesystem-mgw45-mt-s-1_47 boost_regex-mgw45-mt-s-1_47 boost_system-mgw45-mt-s-1_47 boost_thread-mgw45-mt-s-1_47'
-BF_BOOST_LIBPATH = '#../lib/windows/boost/lib/gcc'
+BF_BOOST_LIBPATH = BF_BOOST + '/lib/gcc'
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_hsv.osl
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_hsv.osl 2011-12-29 06:32:50 UTC (rev 42967)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_hsv.osl 2011-12-29 06:44:51 UTC (rev 42968)
@@ -30,7 +30,8 @@
float t = clamp(Fac, 0.0, 1.0);
color Color = rgb_to_hsv(ColorIn);
- Color[0] += Hue - 0.5;
+ // remember: fmod doesn't work for negative numbers
+ Color[0] += Hue + 0.5;
Color[0] = fmod(Color[0], 1.0);
Color[1] *= Saturation;
Color[2] *= Value;
Modified: branches/bmesh/blender/intern/cycles/kernel/svm/svm_hsv.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm_hsv.h 2011-12-29 06:32:50 UTC (rev 42967)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_hsv.h 2011-12-29 06:44:51 UTC (rev 42968)
@@ -110,7 +110,8 @@
color = rgb_to_hsv(color);
- color.x += hue - 0.5f;
+ // remember: fmod doesn't work for negative numbers
+ color.x += hue + 0.5f;
color.x = fmod(color.x, 1.0f);
color.y *= sat;
color.z *= val;
Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c 2011-12-29 06:32:50 UTC (rev 42967)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_mirror.c 2011-12-29 06:44:51 UTC (rev 42968)
@@ -93,15 +93,10 @@
}
}
-
-/* Mirror */
-#define VERT_NEW 1
-
static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
- Object *ob,
- DerivedMesh *dm,
- int UNUSED(initFlags),
- int axis)
+ Object *ob,
+ DerivedMesh *dm,
+ int axis)
{
float tolerance_sq;
DerivedMesh *cddm, *origdm;
@@ -266,23 +261,22 @@
}
static DerivedMesh *mirrorModifier__doMirror(MirrorModifierData *mmd,
- Object *ob, DerivedMesh *dm,
- int initFlags)
+ Object *ob, DerivedMesh *dm)
{
DerivedMesh *result = dm;
/* check which axes have been toggled and mirror accordingly */
if(mmd->flag & MOD_MIR_AXIS_X) {
- result = doMirrorOnAxis(mmd, ob, result, initFlags, 0);
+ result = doMirrorOnAxis(mmd, ob, result, 0);
}
if(mmd->flag & MOD_MIR_AXIS_Y) {
DerivedMesh *tmp = result;
- result = doMirrorOnAxis(mmd, ob, result, initFlags, 1);
+ result = doMirrorOnAxis(mmd, ob, result, 1);
if(tmp != dm) tmp->release(tmp); /* free intermediate results */
}
if(mmd->flag & MOD_MIR_AXIS_Z) {
DerivedMesh *tmp = result;
- result = doMirrorOnAxis(mmd, ob, result, initFlags, 2);
+ result = doMirrorOnAxis(mmd, ob, result, 2);
if(tmp != dm) tmp->release(tmp); /* free intermediate results */
}
@@ -297,7 +291,7 @@
DerivedMesh *result;
MirrorModifierData *mmd = (MirrorModifierData*) md;
- result = mirrorModifier__doMirror(mmd, ob, derivedData, 0);
+ result = mirrorModifier__doMirror(mmd, ob, derivedData);
if(result != derivedData)
CDDM_calc_normals(result);
More information about the Bf-blender-cvs
mailing list