[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43006] branches/soc-2011-onion-uv-tools: merge with trunk 43005
Antony Riakiotakis
kalast at gmail.com
Fri Dec 30 18:31:53 CET 2011
Revision: 43006
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43006
Author: psy-fi
Date: 2011-12-30 17:31:44 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
merge with trunk 43005
Modified Paths:
--------------
branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-onion-uv-tools/extern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/CMakeLists.txt
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_camera.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_hsv.osl
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_normal.h
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-onion-uv-tools/intern/smoke/intern/smoke_API.cpp
branches/soc-2011-onion-uv-tools/release/plugins/sequence/color-correction-hsv.c
branches/soc-2011-onion-uv-tools/release/plugins/sequence/color-correction-yuv.c
branches/soc-2011-onion-uv-tools/release/plugins/sequence/dnr.c
branches/soc-2011-onion-uv-tools/release/plugins/sequence/gamma.c
branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/utils.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_array_mallocn.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-onion-uv-tools/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2011-onion-uv-tools/source/blender/collada/MeshImporter.cpp
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_intern.h
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_ops.c
branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editfont.c
branches/soc-2011-onion-uv-tools/source/blender/editors/include/BIF_glutil.h
branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_bake.c
branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_preview.c
branches/soc-2011-onion-uv-tools/source/blender/editors/screen/glutil.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/space_node.c
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2011-onion-uv-tools/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/divers.c
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_ID.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_armature_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_boid_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_brush_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_camera_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_color_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_controller_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_defs.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_effect_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_genfile.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_group_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_listBase.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_material_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meta_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_nla_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_fluidsim.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_packedFile_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_property_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sound_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_speaker_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_text_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_vec_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2011-onion-uv-tools/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/InputParser.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Operator1Expr.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Operator2Expr.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/StringValue.h
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Value.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/Value.h
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_TouchSensor.cpp
Property Changed:
----------------
branches/soc-2011-onion-uv-tools/
branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_ffmpeg.c
branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_ffmpeg.h
Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42942
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42472
/trunk/blender:39665-43005
Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py 2011-12-30 17:31:44 UTC (rev 43006)
@@ -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/soc-2011-onion-uv-tools/extern/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/extern/CMakeLists.txt 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/extern/CMakeLists.txt 2011-12-30 17:31:44 UTC (rev 43006)
@@ -45,7 +45,7 @@
endif()
if(WITH_GAMEENGINE)
- add_subdirectory(recastnavigation)
+ add_subdirectory(recastnavigation)
endif()
if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
Modified: branches/soc-2011-onion-uv-tools/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2011-12-30 17:31:44 UTC (rev 43006)
@@ -202,7 +202,7 @@
}
- void
+ void
BSP_GhostTestApp3D::
UpdateFrame(
){
@@ -210,9 +210,9 @@
GHOST_Rect v_rect;
m_window->getClientBounds(v_rect);
-
+
glViewport(0,0,v_rect.getWidth(),v_rect.getHeight());
-
+
}
}
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/CMakeLists.txt 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/CMakeLists.txt 2011-12-30 17:31:44 UTC (rev 43006)
@@ -36,19 +36,19 @@
endif()
if(WITH_CYCLES_NETWORK)
- add_definitions(-DWITH_NETWORK)
+ add_definitions(-DWITH_NETWORK)
endif()
if(WITH_CYCLES_OSL)
- add_definitions(-DWITH_OSL)
+ add_definitions(-DWITH_OSL)
endif()
if(WITH_CYCLES_PARTIO)
- add_definitions(-DWITH_PARTIO)
+ add_definitions(-DWITH_PARTIO)
endif()
if(WITH_CYCLES_CUDA_BINARIES)
- add_definitions(-DWITH_CUDA_BINARIES)
+ add_definitions(-DWITH_CUDA_BINARIES)
endif()
add_definitions(-DWITH_OPENCL)
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_camera.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_camera.cpp 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_camera.cpp 2011-12-30 17:31:44 UTC (rev 43006)
@@ -72,17 +72,12 @@
if(!b_dof_object)
return b_camera.dof_distance();
- /* for dof object, return distance along camera direction. this is
- * compatible with blender, but does it fit our dof model? */
- Transform obmat = get_transform(b_ob.matrix_world());
+ /* for dof object, return distance along camera Z direction */
+ Transform obmat = transform_clear_scale(get_transform(b_ob.matrix_world()));
Transform dofmat = get_transform(b_dof_object.matrix_world());
+ Transform mat = transform_inverse(obmat) * dofmat;
- float3 cam_p = transform_get_column(&obmat, 3);
- float3 cam_dir = normalize(transform_get_column(&obmat, 2));
- float3 dof_p = transform_get_column(&dofmat, 3);
- float3 proj_p = dot(dof_p, cam_dir) * cam_dir;
-
- return len(proj_p - cam_p);
+ return fabsf(transform_get_column(&mat, 3).z);
}
static void blender_camera_from_object(BlenderCamera *bcam, BL::Object b_ob)
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_shader.cpp 2011-12-30 17:31:44 UTC (rev 43006)
@@ -597,10 +597,14 @@
else
to_pair = sockets_map[b_to_sock.ptr.data];
- ShaderOutput *output = from_pair.first->output(from_pair.second.c_str());
- ShaderInput *input = to_pair.first->input(to_pair.second.c_str());
+ /* either node may be NULL when the node was not exported, typically
+ because the node type is not supported */
+ if(from_pair.first && to_pair.first) {
+ ShaderOutput *output = from_pair.first->output(from_pair.second.c_str());
+ ShaderInput *input = to_pair.first->input(to_pair.second.c_str());
- graph->connect(output, input);
+ graph->connect(output, input);
+ }
}
}
Modified: branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_hsv.osl
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_hsv.osl 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/osl/nodes/node_hsv.osl 2011-12-30 17:31:44 UTC (rev 43006)
@@ -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/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_hsv.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_hsv.h 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_hsv.h 2011-12-30 17:31:44 UTC (rev 43006)
@@ -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/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_normal.h
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_normal.h 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_normal.h 2011-12-30 17:31:44 UTC (rev 43006)
@@ -25,9 +25,9 @@
float3 normal = stack_load_float3(stack, in_normal_offset);
float3 direction;
- direction.x = node1.x;
- direction.y = node1.y;
- direction.z = node1.z;
+ direction.x = __int_as_float(node1.x);
+ direction.y = __int_as_float(node1.y);
+ direction.z = __int_as_float(node1.z);
direction = normalize(direction);
if (stack_valid(out_normal_offset))
Modified: branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-12-30 17:31:44 UTC (rev 43006)
@@ -579,7 +579,8 @@
static bool g_hasFirstFile = false;
static char g_firstFileBuf[512];
-extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) {
+extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
+{
if (g_hasFirstFile) {
strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
buf[FIRSTFILEBUFLG - 1] = '\0';
Modified: branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm 2011-12-30 17:31:44 UTC (rev 43006)
@@ -451,7 +451,8 @@
static char g_firstFileBuf[512];
//TODO:Need to investigate this. Function called too early in creator.c to have g_hasFirstFile == true
-extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) {
+extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG])
+{
if (g_hasFirstFile) {
strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1);
buf[FIRSTFILEBUFLG - 1] = '\0';
Modified: branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp 2011-12-30 17:31:44 UTC (rev 43006)
@@ -296,7 +296,8 @@
}
-static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {
+static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep)
+{
int fd = ConnectionNumber(display);
fd_set fds;
Modified: branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowCarbon.cpp 2011-12-30 14:52:03 UTC (rev 43005)
+++ branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowCarbon.cpp 2011-12-30 17:31:44 UTC (rev 43006)
@@ -70,7 +70,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list