[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49815] branches/soc-2011-tomato: Merging r49808 through r49814 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sat Aug 11 20:25:46 CEST 2012
Revision: 49815
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49815
Author: nazgul
Date: 2012-08-11 18:25:45 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Merging r49808 through r49814 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49808
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49814
Modified Paths:
--------------
branches/soc-2011-tomato/SConstruct
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/source/blender/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/datafiles/SConscript
branches/soc-2011-tomato/source/blender/editors/include/ED_datafiles.h
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/creator/creator.c
Added Paths:
-----------
branches/soc-2011-tomato/release/datafiles/bfont.pfb
branches/soc-2011-tomato/release/datafiles/prvicons.png
branches/soc-2011-tomato/source/blender/datatoc/
branches/soc-2011-tomato/source/blender/datatoc/CMakeLists.txt
branches/soc-2011-tomato/source/blender/datatoc/datatoc.c
Removed Paths:
-------------
branches/soc-2011-tomato/build_files/cmake/data_to_c.cmake
branches/soc-2011-tomato/release/datafiles/.Bfont
branches/soc-2011-tomato/release/datafiles/prvicons
branches/soc-2011-tomato/source/blender/datatoc/CMakeLists.txt
branches/soc-2011-tomato/source/blender/datatoc/datatoc.c
branches/soc-2011-tomato/source/blender/editors/datafiles/Bfont.c
branches/soc-2011-tomato/source/blender/editors/datafiles/add.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/bfont.ttf.c
branches/soc-2011-tomato/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/blob.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/blur.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/bmonofont.ttf.c
branches/soc-2011-tomato/source/blender/editors/datafiles/clay.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/claystrips.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/clone.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/crease.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/darken.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/draw.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/fill.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/flatten.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/grab.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/inflate.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/layer.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/lighten.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/mask.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/mix.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/multiply.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/nudge.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/pinch.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/prvicons.c
branches/soc-2011-tomato/source/blender/editors/datafiles/scrape.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/smear.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/smooth.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/snake_hook.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/soften.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/subtract.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/texdraw.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/thumb.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/twist.png.c
branches/soc-2011-tomato/source/blender/editors/datafiles/vertexdraw.png.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49807
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-49814
Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct 2012-08-11 18:07:01 UTC (rev 49814)
+++ branches/soc-2011-tomato/SConstruct 2012-08-11 18:25:45 UTC (rev 49815)
@@ -455,7 +455,7 @@
# use for includes
env['DATA_HEADERS'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_headers")
env['DATA_SOURCES'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_sources")
-def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
+def data_to_c(FILE_FROM, FILE_TO, VAR_NAME):
if os.sep == "\\":
FILE_FROM = FILE_FROM.replace("/", "\\")
FILE_TO = FILE_TO.replace("/", "\\")
@@ -486,43 +486,70 @@
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")
+def data_to_c_simple(FILE_FROM):
+ filename_only = os.path.basename(FILE_FROM)
+ FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
+ VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
+
+ data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
+
-ensure_data("./release/datafiles/startup.blend",
- B.root_build_dir + "data_sources/startup.blend.c",
- "datatoc_startup_blend")
+data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+ B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+ "datatoc_COM_OpenCLKernels_cl")
-ensure_data("./release/datafiles/preview.blend",
- B.root_build_dir + "data_sources/preview.blend.c",
- "datatoc_preview_blend")
+data_to_c_simple("release/datafiles/startup.blend")
+data_to_c_simple("release/datafiles/preview.blend")
# --- glsl ---
-ensure_data("source/blender/gpu/shaders/gpu_shader_material.glsl",
- B.root_build_dir + "data_sources/gpu_shader_material.glsl.c",
- "datatoc_gpu_shader_material_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_vertex.glsl",
- B.root_build_dir + "data_sources/gpu_shader_vertex.glsl.c",
- "datatoc_gpu_shader_vertex_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl",
- B.root_build_dir + "data_sources/gpu_shader_sep_gaussian_blur_frag.glsl.c",
- "datatoc_gpu_shader_sep_gaussian_blur_frag_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl",
- B.root_build_dir + "data_sources/gpu_shader_sep_gaussian_blur_vert.glsl.c",
- "datatoc_gpu_shader_sep_gaussian_blur_vert_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_material.glsl",
- B.root_build_dir + "data_sources/gpu_shader_material.glsl.c",
- "datatoc_gpu_shader_material_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl",
- B.root_build_dir + "data_sources/gpu_shader_vsm_store_frag.glsl.c",
- "datatoc_gpu_shader_vsm_store_frag_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl",
- B.root_build_dir + "data_sources/gpu_shader_vsm_store_vert.glsl.c",
- "datatoc_gpu_shader_vsm_store_vert_glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+# --- blender ---
+data_to_c_simple("release/datafiles/bfont.pfb")
+data_to_c_simple("release/datafiles/bfont.ttf")
+data_to_c_simple("release/datafiles/bmonofont.ttf")
+data_to_c_simple("release/datafiles/splash.png")
+data_to_c_simple("release/datafiles/blender_icons.png")
+data_to_c_simple("release/datafiles/prvicons.png")
+data_to_c_simple("release/datafiles/brushicons/add.png")
+data_to_c_simple("release/datafiles/brushicons/blob.png")
+data_to_c_simple("release/datafiles/brushicons/blur.png")
+data_to_c_simple("release/datafiles/brushicons/clay.png")
+data_to_c_simple("release/datafiles/brushicons/claystrips.png")
+data_to_c_simple("release/datafiles/brushicons/clone.png")
+data_to_c_simple("release/datafiles/brushicons/crease.png")
+data_to_c_simple("release/datafiles/brushicons/darken.png")
+data_to_c_simple("release/datafiles/brushicons/draw.png")
+data_to_c_simple("release/datafiles/brushicons/fill.png")
+data_to_c_simple("release/datafiles/brushicons/flatten.png")
+data_to_c_simple("release/datafiles/brushicons/grab.png")
+data_to_c_simple("release/datafiles/brushicons/inflate.png")
+data_to_c_simple("release/datafiles/brushicons/layer.png")
+data_to_c_simple("release/datafiles/brushicons/lighten.png")
+data_to_c_simple("release/datafiles/brushicons/mask.png")
+data_to_c_simple("release/datafiles/brushicons/mix.png")
+data_to_c_simple("release/datafiles/brushicons/multiply.png")
+data_to_c_simple("release/datafiles/brushicons/nudge.png")
+data_to_c_simple("release/datafiles/brushicons/pinch.png")
+data_to_c_simple("release/datafiles/brushicons/scrape.png")
+data_to_c_simple("release/datafiles/brushicons/smear.png")
+data_to_c_simple("release/datafiles/brushicons/smooth.png")
+data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
+data_to_c_simple("release/datafiles/brushicons/soften.png")
+data_to_c_simple("release/datafiles/brushicons/subtract.png")
+data_to_c_simple("release/datafiles/brushicons/texdraw.png")
+data_to_c_simple("release/datafiles/brushicons/thumb.png")
+data_to_c_simple("release/datafiles/brushicons/twist.png")
+data_to_c_simple("release/datafiles/brushicons/vertexdraw.png")
+
##### END DATAFILES ##########
Help(opts.GenerateHelpText(env))
Deleted: branches/soc-2011-tomato/build_files/cmake/data_to_c.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/data_to_c.cmake 2012-08-11 18:07:01 UTC (rev 49814)
+++ branches/soc-2011-tomato/build_files/cmake/data_to_c.cmake 2012-08-11 18:25:45 UTC (rev 49815)
@@ -1,25 +0,0 @@
-# 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-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-08-11 18:07:01 UTC (rev 49814)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-08-11 18:25:45 UTC (rev 49815)
@@ -735,19 +735,21 @@
# TODO, create a C binary and call it instead!, doing this in cmake its slow
macro(data_to_c
- file_from file_to var_name
+ 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}
- -DFILE_FROM=${file_from}
- -DFILE_TO=${file_to}
- -DVAR_NAME=${var_name}
- -P ${CMAKE_SOURCE_DIR}/build_files/cmake/data_to_c.cmake
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+ COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc
+ ${file_from}
+ ${file_to}
DEPENDS ${file_from})
+ unset(_file_to_path)
endmacro()
# same as above but generates the var name and output automatic.
@@ -755,26 +757,22 @@
file_from
list_to_add)
- # get var name automatic from name
- get_filename_component(_file_from_only ${file_from} NAME)
- string(REPLACE "." "_" _file_from_only ${_file_from_only})
- set(_var_name "datatoc_${_file_from_only}")
+ # only to avoid confusion
+ set(_file_to ${file_from}.c)
- # only to avoid confusion
- set(_file_to ${file_from}.c)
-
list(APPEND ${list_to_add} ${CMAKE_CURRENT_BINARY_DIR}/${_file_to})
+ get_filename_component(_file_to_path ${_file_to} PATH)
+
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
- COMMAND ${CMAKE_COMMAND}
- -DFILE_FROM=${CMAKE_CURRENT_SOURCE_DIR}/${file_from}
- -DFILE_TO=${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
- -DVAR_NAME=${_var_name}
- -P ${CMAKE_SOURCE_DIR}/build_files/cmake/data_to_c.cmake
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+ COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc
+ ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}
+ ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file_from})
- unset(_file_from_only)
- unset(_var_name)
- unset(_file_to)
+ unset(_var_name)
+ unset(_file_to)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list