Revision: 49752
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49752
Author: psy-fi
Date: 2012-08-10 00:42:11 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
merge with trunk 49750
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/SConstruct
branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
branches/soc-2012-bratwurst/intern/cycles/app/cycles_test.cpp
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2012-bratwurst/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/__init__.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_image.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_node.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_cloth.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_context.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_global.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/blender.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/camera.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cloth.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/constraint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/curve.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/displist.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/implicit.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mball.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/object.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/pointcache.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/scene.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqcache.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sequencer.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/softbody.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/sound.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_array.h
branches/soc-2012-bratwurst/source/blender/blenlib/BLI_utildefines.h
branches/soc-2012-bratwurst/source/blender/blenlib/intern/rct.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/stack.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/versioning_250.c
branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/compositor/SConscript
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ScaleOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_deps.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_draw.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_filter.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_markers.c
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_ops.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_anim.c
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_templates.c
branches/soc-2012-bratwurst/source/blender/editors/interface/resources.c
branches/soc-2012-bratwurst/source/blender/editors/interface/view2d_ops.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_add.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_draw.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editface.c
branches/soc-2012-bratwurst/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_bake.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_modifier.c
branches/soc-2012-bratwurst/source/blender/editors/object/object_select.c
branches/soc-2012-bratwurst/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2012-bratwurst/source/blender/editors/physics/physics_fluid.c
branches/soc-2012-bratwurst/source/blender/editors/physics/physics_pointcache.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_internal.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_opengl.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_preview.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_view.c
branches/soc-2012-bratwurst/source/blender/editors/screen/area.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_edit.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_ops.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2012-bratwurst/source/blender/editors/space_action/action_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/tracking_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/file_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/filelist.c
branches/soc-2012-bratwurst/source/blender/editors/space_file/space_file.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_graph/graph_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_info/info_report.c
branches/soc-2012-bratwurst/source/blender/editors/space_logic/logic_window.c
branches/soc-2012-bratwurst/source/blender/editors/space_nla/nla_channels.c
branches/soc-2012-bratwurst/source/blender/editors/space_nla/nla_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_add.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_header.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_view.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/space_node.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/drawobject.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform.h
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_conversions.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2012-bratwurst/source/blender/imbuf/IMB_imbuf.h
branches/soc-2012-bratwurst/source/blender/imbuf/IMB_moviecache.h
branches/soc-2012-bratwurst/source/blender/imbuf/intern/filter.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/imageprocess.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/moviecache.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/scaling.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_space_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/RNA_access.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_access.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_scene.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_screen.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_space.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2012-bratwurst/source/blender/nodes/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/nodes/NOD_composite.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_common.c
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_common.h
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_util.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2012-bratwurst/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_app.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_props.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_rna.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/convertblender.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/external_engine.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/pipeline.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_texture.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/shadbuf.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/texture_ocean.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/zbuf.c
branches/soc-2012-bratwurst/source/blender/windowmanager/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/windowmanager/WM_api.h
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2012-bratwurst/source/blenderplayer/CMakeLists.txt
branches/soc-2012-bratwurst/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2012-bratwurst/source/creator/CMakeLists.txt
branches/soc-2012-bratwurst/source/creator/creator.c
branches/soc-2012-bratwurst/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
branches/soc-2012-bratwurst/release/scripts/startup/bl_operators/node.py
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_InpaintNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_InpaintNode.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_InpaintOperation.h
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2012-bratwurst/source/blender/windowmanager/intern/wm_playanim.c
Removed Paths:
-------------
branches/soc-2012-bratwurst/release/datafiles/clkernelstoh.py
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
Property Changed:
----------------
branches/soc-2012-bratwurst/
branches/soc-2012-bratwurst/source/blender/editors/interface/interface.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/
Property changes on: branches/soc-2012-bratwurst
___________________________________________________________________
Modified: svn:mergeinfo
-
/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
/trunk/blender:46808-49612
+
/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
/trunk/blender:46808-49750
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2012-08-10 00:40:10 UTC (rev
49751)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2012-08-10 00:42:11 UTC (rev
49752)
@@ -249,7 +249,7 @@
option(WITH_CYCLES_TEST "Build cycles test
application" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support"
OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA
architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 sm_30 CACHE STRING "CUDA
architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
unset(PLATFORM_DEFAULT)
@@ -273,7 +273,9 @@
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for
actual system-version
- if (${MAC_SYS} MATCHES 11)
+ if (${MAC_SYS} MATCHES 12)
+ set(OSX_SYSTEM 10.8)
+ elseif (${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
elseif(${MAC_SYS} MATCHES 10)
set(OSX_SYSTEM 10.6)
@@ -1488,6 +1490,16 @@
if(MSVC)
# for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__)
+
+# OSX-Note: as we do crosscompiling with specific set architecture,
+# endianess-detection and autosetting is counterproductive
+# so we just set endianess according CMAKE_OSX_ARCHITECTURES
+
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES
x86_64)
+ add_definitions(-D__LITTLE_ENDIAN__)
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES
ppc64)
+ add_definitions(-D__BIG_ENDIAN__)
+
else()
include(TestBigEndian)
test_big_endian(_SYSTEM_BIG_ENDIAN)
Modified: branches/soc-2012-bratwurst/SConstruct
===================================================================
--- branches/soc-2012-bratwurst/SConstruct 2012-08-10 00:40:10 UTC (rev
49751)
+++ branches/soc-2012-bratwurst/SConstruct 2012-08-10 00:42:11 UTC (rev
49752)
@@ -445,6 +445,50 @@
# if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
# os.makedirs ( B.doc_build_dir )
+###################################
+# Ensure all data files are valid #
+###################################
+if not os.path.isdir ( B.root_build_dir + 'data_headers'):
+ os.makedirs ( B.root_build_dir + 'data_headers' )
+# use for includes
+env['DATA_HEADERS'] = "#" + env['BF_BUILDDIR'] + "/data_headers"
+def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
+ if os.sep == "\\":
+ FILE_FROM = FILE_FROM.replace("/", "\\")
+ FILE_TO = FILE_TO.replace("/", "\\")
+
+ # first check if we need to bother.
+ if os.path.exists(FILE_TO):
+ if os.path.getmtime(FILE_FROM) < os.path.getmtime(FILE_TO):
+ return
+
+ print(B.bc.HEADER + "Generating: " + B.bc.ENDC + "%r" %
os.path.basename(FILE_TO))
+ fpin = open(FILE_FROM, "rb")
+ fpin.seek(0, os.SEEK_END)
+ size = fpin.tell()
+ fpin.seek(0)
+
+ fpout = open(FILE_TO, "w")
+ fpout.write("int %s_size = %d;\n" % (VAR_NAME, size))
+ fpout.write("char %s[] = {\n" % VAR_NAME)
+
+ while size > 0:
+ size -= 1
+ if size % 32 == 31:
+ fpout.write("\n")
+
+ fpout.write("%3d," % ord(fpin.read(1)))
+ fpout.write("\n 0};\n\n")
+
+ fpin.close()
+ fpout.close()
+
+ensure_data("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+ B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+ "clkernelstoh_COM_OpenCLKernels_cl")
+
+##### END DATAFILES ##########
+
Help(opts.GenerateHelpText(env))
# default is new quieter output, but if you need to see the
Copied: branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake (from rev
49750, trunk/blender/build_files/cmake/data_to_c.cmake)
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
(rev 0)
+++ branches/soc-2012-bratwurst/build_files/cmake/data_to_c.cmake
2012-08-10 00:42:11 UTC (rev 49752)
@@ -0,0 +1,25 @@
+# cmake script, to be called on its own with 3 defined args
+#
+# - FILE_FROM
+# - FILE_TO
+# - VAR_NAME
+
+# not highly optimal, may replace with generated C program like makesdna
+file(READ ${FILE_FROM} file_from_string HEX)
+string(LENGTH ${file_from_string} _max_index)
+math(EXPR size_on_disk ${_max_index}/2)
+
+file(REMOVE ${FILE_TO})
+
+file(APPEND ${FILE_TO} "int ${VAR_NAME}_size = ${size_on_disk};\n")
+file(APPEND ${FILE_TO} "char ${VAR_NAME}[] = {")
+
+set(_index 0)
+
+while(NOT _index EQUAL _max_index)
+ string(SUBSTRING "${file_from_string}" ${_index} 2 _pair)
+ file(APPEND ${FILE_TO} "0x${_pair},")
+ math(EXPR _index ${_index}+2)
+endwhile()
+# null terminator not essential but good if we want plane strings encoded
+file(APPEND ${FILE_TO} "0x00};\n")
Modified: branches/soc-2012-bratwurst/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-bratwurst/build_files/cmake/macros.cmake 2012-08-10
00:40:10 UTC (rev 49751)
+++ branches/soc-2012-bratwurst/build_files/cmake/macros.cmake 2012-08-10
00:42:11 UTC (rev 49752)
@@ -725,3 +725,31 @@
set(${lvar} ${LIBDIR}/${lproj})
endif()
endmacro()
+
+
+# not highly optimal, may replace with generated C program like makesdna
+function(data_to_c
+ file_from file_to var_name)
+
+ file(READ ${file_from} file_from_string HEX)
+ string(LENGTH ${file_from_string} _max_index)
+ math(EXPR size_on_disk ${_max_index}/2)
+
+ file(REMOVE ${file_to})
+
+ file(APPEND ${file_to} "int ${var_name}_size = ${size_on_disk};\n")
+ file(APPEND ${file_to} "char ${var_name}[] = {")
+
+ set(_index 0)
+
+ while(NOT _index EQUAL _max_index)
+ string(SUBSTRING "${file_from_string}" ${_index} 2 _pair)
+ file(APPEND ${file_to} "0x${_pair},")
+ math(EXPR _index ${_index}+2)
+ endwhile()
+ file(APPEND ${file_to} "};\n")
+endfunction()
+
+# eg
+# data_to_c("/home/guest/test.txt" "/home/guest/test.txt.h" "this_is_data")
+
Modified: branches/soc-2012-bratwurst/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/app/cycles_test.cpp
2012-08-10 00:40:10 UTC (rev 49751)
+++ branches/soc-2012-bratwurst/intern/cycles/app/cycles_test.cpp
2012-08-10 00:42:11 UTC (rev 49752)
@@ -245,7 +245,7 @@
NULL);
if(ap.parse(argc, argv) < 0) {
- fprintf(stderr, "%s\n", ap.error_message().c_str());
+ fprintf(stderr, "%s\n", ap.geterror().c_str());
ap.usage();
exit(EXIT_FAILURE);
}
Modified: branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemCocoa.mm
2012-08-10 00:40:10 UTC (rev 49751)
+++ branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemCocoa.mm
2012-08-10 00:42:11 UTC (rev 49752)
@@ -527,7 +527,7 @@
// So WM_exit needs to be called directly, as the event loop will never run
before termination
- (void)applicationWillTerminate:(NSNotification *)aNotification
{
- /*G.afbreek = 0; //Let Cocoa perform the termination at the end
+ /*G.is_break = FALSE; //Let Cocoa perform the termination at the end
WM_exit(C);*/
}
Modified: branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp
2012-08-10 00:40:10 UTC (rev 49751)
+++ branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_SystemX11.cpp
2012-08-10 00:42:11 UTC (rev 49752)
@@ -152,7 +152,9 @@
~GHOST_SystemX11()
{
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
- XCloseIM(m_xim);
+ if (m_xim) {
+ XCloseIM(m_xim);
+ }
#endif
XCloseDisplay(m_display);
Deleted: branches/soc-2012-bratwurst/release/datafiles/clkernelstoh.py
===================================================================
--- branches/soc-2012-bratwurst/release/datafiles/clkernelstoh.py
2012-08-10 00:40:10 UTC (rev 49751)
+++ branches/soc-2012-bratwurst/release/datafiles/clkernelstoh.py
2012-08-10 00:42:11 UTC (rev 49752)
@@ -1,70 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
