[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59874] branches/soc-2013-depsgraph_mt: Merging r59825 through r59873 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Fri Sep 6 12:35:41 CEST 2013
Revision: 59874
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59874
Author: nazgul
Date: 2013-09-06 10:35:41 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Merging r59825 through r59873 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59825
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59873
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-depsgraph_mt/intern/ghost/test/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/node.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_brush.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/anim.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/brush.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mask.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/text.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/listbase.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/bmesh.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/bmesh_class.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-depsgraph_mt/source/blender/collada/MeshImporter.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ColorRampNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_clip.h
branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_resources.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/resources.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_transform.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_opengl.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/glutil.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_editor.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/tracking_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/drawnode.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_add.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_intern.h
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/node_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/space_node.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/Functions0D.h
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-depsgraph_mt/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/divers.c
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/render_result.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-depsgraph_mt/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2013-depsgraph_mt/intern/ghost/test/multitest/stubs.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_sort_utils.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/sort_utils.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertOperation.h
Removed Paths:
-------------
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_CombineChannelsOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertColorToBWOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertColorToValueProg.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertPremulToStraightOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertStraightToPremulOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertValueToColorProg.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertValueToColorProg.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_SeparateChannelOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_SeparateChannelOperation.h
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59824
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59873
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp 2013-09-06 10:23:21 UTC (rev 59873)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp 2013-09-06 10:35:41 UTC (rev 59874)
@@ -820,7 +820,7 @@
}
/* add hair geometry to mesh */
- if(primitive == CURVE_TRIANGLES){
+ if(primitive == CURVE_TRIANGLES) {
if(triangle_method == CURVE_CAMERA_TRIANGLES)
ExportCurveTrianglePlanes(mesh, &CData, RotCam);
else {
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h 2013-09-06 10:23:21 UTC (rev 59873)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h 2013-09-06 10:35:41 UTC (rev 59874)
@@ -444,7 +444,7 @@
float tb = 2*(tdif.z - tg.z*(tdifz + gd*(tdifz*gd + or1)));
float tc = dot(tdif,tdif) - tdifz * tdifz * (1 + gd*gd) - or1*or1 - 2*or1*tdifz*gd;
float td = tb*tb - 4*cyla*tc;
- if (td < 0.0f){
+ if (td < 0.0f) {
tree++;
level = tree & -tree;
continue;
Modified: branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemSDL.cpp 2013-09-06 10:23:21 UTC (rev 59873)
+++ branches/soc-2013-depsgraph_mt/intern/ghost/intern/GHOST_SystemSDL.cpp 2013-09-06 10:35:41 UTC (rev 59874)
@@ -276,6 +276,18 @@
}
#undef GXMAP
+/**
+ * Events don't always have valid windows,
+ * but GHOST needs a window _always_. fallback to the GL window.
+ */
+static SDL_Window *SDL_GetWindowFromID_fallback(Uint32 id)
+{
+ SDL_Window *sdl_win = SDL_GetWindowFromID(id);
+ if (sdl_win == NULL) {
+ sdl_win = SDL_GL_GetCurrentWindow();
+ }
+ return sdl_win;
+}
void
GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
@@ -286,7 +298,7 @@
case SDL_WINDOWEVENT:
{
SDL_WindowEvent &sdl_sub_evt = sdl_event->window;
- GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID));
+ GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
//assert(window != NULL); // can be NULL on close window.
switch (sdl_sub_evt.event) {
@@ -318,7 +330,7 @@
case SDL_MOUSEMOTION:
{
SDL_MouseMotionEvent &sdl_sub_evt = sdl_event->motion;
- SDL_Window *sdl_win = SDL_GetWindowFromID(sdl_sub_evt.windowID);
+ SDL_Window *sdl_win = SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID);
GHOST_WindowSDL *window = findGhostWindow(sdl_win);
assert(window != NULL);
@@ -379,7 +391,7 @@
GHOST_TButtonMask gbmask = GHOST_kButtonMaskLeft;
GHOST_TEventType type = (sdl_sub_evt.state == SDL_PRESSED) ? GHOST_kEventButtonDown : GHOST_kEventButtonUp;
- GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID));
+ GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
assert(window != NULL);
/* process rest of normal mouse buttons */
@@ -403,7 +415,7 @@
case SDL_MOUSEWHEEL:
{
SDL_MouseWheelEvent &sdl_sub_evt = sdl_event->wheel;
- GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID));
+ GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
assert(window != NULL);
g_event = new GHOST_EventWheel(getMilliSeconds(), window, sdl_sub_evt.y);
}
@@ -415,7 +427,7 @@
SDL_Keycode sym = sdl_sub_evt.keysym.sym;
GHOST_TEventType type = (sdl_sub_evt.state == SDL_PRESSED) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp;
- GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID));
+ GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
assert(window != NULL);
GHOST_TKey gkey = convertSDLKey(sdl_sub_evt.keysym.scancode);
Modified: branches/soc-2013-depsgraph_mt/intern/ghost/test/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/ghost/test/CMakeLists.txt 2013-09-06 10:23:21 UTC (rev 59873)
+++ branches/soc-2013-depsgraph_mt/intern/ghost/test/CMakeLists.txt 2013-09-06 10:35:41 UTC (rev 59874)
@@ -4,6 +4,10 @@
cmake_minimum_required(VERSION 2.8)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../../..//build_files/cmake/Modules")
+
+set(WITH_GUARDEDALLOC ON)
+
# -----------------------------------------------------------------------------
# Macros
@@ -33,7 +37,22 @@
unset(_file)
endmacro()
+macro(data_to_c
+ file_from file_to
+ list_to_add)
+ list(APPEND ${list_to_add} ${file_to})
+
+ get_filename_component(_file_to_path ${file_to} PATH)
+
+ add_custom_command(
+ OUTPUT ${file_to}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+ COMMAND ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
+ DEPENDS ${file_from} datatoc)
+ unset(_file_to_path)
+endmacro()
+
# -----------------------------------------------------------------------------
# Defines
@@ -52,7 +71,6 @@
unset(_SYSTEM_BIG_ENDIAN)
endif()
-
# -----------------------------------------------------------------------------
# Libraries
@@ -84,23 +102,36 @@
include_directories(${INC_NEW})
add_library(blenfont_lib ${SRC_NEW})
+# wcwidth
+include(${CMAKE_SOURCE_DIR}/../../../extern/wcwidth/CMakeLists.txt)
+suffix_relpaths(INC_NEW "${INC}" "../../../extern/wcwidth/")
+suffix_relpaths(SRC_NEW "${SRC}" "../../../extern/wcwidth/")
+include_directories(${INC_NEW})
+add_library(wcwidth_lib ${SRC_NEW})
+
# grr, blenfont needs BLI
include_directories(
"../../../source/blender/blenlib"
)
add_library(bli_lib
"../../../source/blender/blenlib/intern/fileops.c"
+ "../../../source/blender/blenlib/intern/gsqueue.c"
"../../../source/blender/blenlib/intern/rct.c"
"../../../source/blender/blenlib/intern/string.c"
"../../../source/blender/blenlib/intern/string_utf8.c"
"../../../source/blender/blenlib/intern/listbase.c"
+ "../../../source/blender/blenlib/intern/math_color.c"
"../../../source/blender/blenlib/intern/storage.c"
+ "../../../source/blender/blenlib/intern/threads.c"
+ "../../../source/blender/blenlib/intern/time.c"
"../../../source/blender/blenlib/intern/path_util.c"
"../../../source/blender/blenlib/intern/BLI_dynstr.c"
"../../../source/blender/blenlib/intern/BLI_linklist.c"
"../../../source/blender/blenlib/intern/BLI_memarena.c"
+ "../../../source/blender/blenlib/intern/BLI_mempool.c"
)
+set(PLATFORM_CGLAGS)
find_package(OpenGL REQUIRED)
@@ -113,18 +144,38 @@
include_directories(${FREETYPE_INCLUDE_DIRS})
include_directories(${CMAKE_SOURCE_DIR}/../../../source/blender/blenfont)
+if(CMAKE_COMPILER_IS_GNUCC)
+ set(PLATFORM_CFLAGS "-funsigned-char")
+endif()
+
if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
+ find_package(GLEW)
+ if(NOT GLEW_FOUND)
+ message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW")
+ endif()
+
set(PLATFORM_LINKLIBS
${X11_X11_LIB}
${X11_Xinput_LIB}
+ ${GLEW_LIBRARY}
+ -lpthread
)
+else()
+ # set(GLEW_LIBRARY "") # unused
+ set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
endif()
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}")
+
# -----------------------------------------------------------------------------
# Executables
+# DataToC
+add_executable(datatoc
+ ${CMAKE_SOURCE_DIR}/../../../source/blender/datatoc/datatoc.c)
# Gears (C)
add_executable(gears_c
@@ -153,22 +204,29 @@
# MultiTest (C)
+set(data_to_c_files)
+data_to_c(${CMAKE_SOURCE_DIR}/../../../release/datafiles/bfont.ttf
+ ${CMAKE_CURRENT_BINARY_DIR}/bfont.ttf.c data_to_c_files)
+
add_executable(multitest_c
- ${CMAKE_SOURCE_DIR}/../../../source/blender/editors/datafiles/bfont.ttf.c
${CMAKE_SOURCE_DIR}/multitest/Basic.c
${CMAKE_SOURCE_DIR}/multitest/EventToBuf.c
${CMAKE_SOURCE_DIR}/multitest/MultiTest.c
${CMAKE_SOURCE_DIR}/multitest/ScrollBar.c
${CMAKE_SOURCE_DIR}/multitest/Util.c
${CMAKE_SOURCE_DIR}/multitest/WindowData.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list