[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60375] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Thu Sep 26 03:41:33 CEST 2013
Revision: 60375
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60375
Author: gdh
Date: 2013-09-26 01:41:31 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60292 to r60374.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60292
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60374
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/SConstruct
branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.h
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-cycles_mblur/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-cycles_mblur/intern/utfconv/utf_winfunc.c
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_texture.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/texture.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/path_util.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_mblur/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_console/console_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/util/crazyspace.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_texture_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_static_types.h
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/node_shader_util.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2013-cycles_mblur/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2013-cycles_mblur/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2013-cycles_mblur/source/blender/render/intern/include/texture.h
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/rayshade.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_types.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-cycles_mblur/source/creator/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/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:57388-60291
+ /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-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/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:57388-60374
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-09-25 23:42:42 UTC (rev 60374)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-09-26 01:41:31 UTC (rev 60375)
@@ -456,7 +456,7 @@
set_and_warn(WITH_OPENAL OFF) # depends on AUDASPACE
set_and_warn(WITH_GAMEENGINE OFF) # depends on AUDASPACE
-elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
# Keep enabled
else()
# Enabled but we don't need it
@@ -798,33 +798,38 @@
find_program(LLVM_CONFIG llvm-config)
endif()
endif()
- execute_process(COMMAND ${LLVM_CONFIG} --version
- OUTPUT_VARIABLE LLVM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --prefix
- OUTPUT_VARIABLE LLVM_DIRECTORY
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIB_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT DEFINED LLVM_VERSION)
+ execute_process(COMMAND ${LLVM_CONFIG} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+ endif()
+ if(NOT DEFINED LLVM_DIRECTORY)
+ execute_process(COMMAND ${LLVM_CONFIG} --prefix
+ OUTPUT_VARIABLE LLVM_DIRECTORY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
+ endif()
+ if(NOT DEFINED LLVM_LIBPATH)
+ execute_process(COMMAND ${LLVM_CONFIG} --libdir
+ OUTPUT_VARIABLE LLVM_LIBPATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+ endif()
+
if(LLVM_STATIC)
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
else()
find_library(LLVM_LIBRARY
NAMES LLVM-${LLVM_VERSION}
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
endif()
- message(STATUS "LLVM version = ${LLVM_VERSION}")
- message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
- message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
- set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
- set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
- if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC)
# if static LLVM libraries were requested, use llvm-config to generate
# the list of what libraries we need, and substitute that in the right
@@ -832,7 +837,7 @@
execute_process(COMMAND ${LLVM_CONFIG} --libfiles
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+ string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
endif()
else()
message(FATAL_ERROR "LLVM not found.")
@@ -1449,7 +1454,7 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
- set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib)
+ set(LLVM_LIBPATH ${LLVM_DIRECTORY}/lib)
# Explicitly set llvm lib order.
#---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive
@@ -1743,13 +1748,13 @@
OUTPUT_VARIABLE LLVM_DIRECTORY
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIB_DIR
+ OUTPUT_VARIABLE LLVM_LIBPATH
OUTPUT_STRIP_TRAILING_WHITESPACE)
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
- PATHS ${LLVM_LIB_DIR})
+ PATHS ${LLVM_LIBPATH})
- if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR)
+ if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC)
# if static LLVM libraries were requested, use llvm-config to generate
# the list of what libraries we need, and substitute that in the right
@@ -1823,22 +1828,22 @@
if(WITH_CYCLES)
if(NOT WITH_OPENIMAGEIO)
- message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
+ message(FATAL_ERROR "Cycles requires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
endif()
if(NOT WITH_BOOST)
- message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
+ message(FATAL_ERROR "Cycles requires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
endif()
if(WITH_CYCLES_OSL)
if(NOT WITH_LLVM)
- message(FATAL_ERROR "Cycles OSL reqires WITH_LLVM, the library may not have been found. Configure LLVM or disable WITH_CYCLES_OSL")
+ message(FATAL_ERROR "Cycles OSL requires WITH_LLVM, the library may not have been found. Configure LLVM or disable WITH_CYCLES_OSL")
endif()
endif()
endif()
if(WITH_INTERNATIONAL)
if(NOT WITH_BOOST)
- message(FATAL_ERROR "Internationalization reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_INTERNATIONAL")
+ message(FATAL_ERROR "Internationalization requires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_INTERNATIONAL")
endif()
endif()
Modified: branches/soc-2013-cycles_mblur/SConstruct
===================================================================
--- branches/soc-2013-cycles_mblur/SConstruct 2013-09-25 23:42:42 UTC (rev 60374)
+++ branches/soc-2013-cycles_mblur/SConstruct 2013-09-26 01:41:31 UTC (rev 60375)
@@ -906,6 +906,11 @@
for f in tf:
textlist.append(tp+os.sep+f)
+# Font licenses
+textlist.append('release/datafiles/LICENSE-bfont.ttf.txt')
+if env['WITH_BF_INTERNATIONAL']:
+ textlist += ['release/datafiles/LICENSE-droidsans.ttf.txt', 'release/datafiles/LICENSE-bmonofont-i18n.ttf.txt']
+
textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
if env['OURPLATFORM']=='darwin':
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-09-25 23:42:42 UTC (rev 60374)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-09-26 01:41:31 UTC (rev 60375)
@@ -243,7 +243,7 @@
link_directories(${EXPAT_LIBPATH})
endif()
if(WITH_LLVM)
- link_directories(${LLVM_LIB_DIR})
+ link_directories(${LLVM_LIBPATH})
endif()
if(WITH_MEM_JEMALLOC)
link_directories(${JEMALLOC_LIBPATH})
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-09-25 23:42:42 UTC (rev 60374)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-09-26 01:41:31 UTC (rev 60375)
@@ -1133,6 +1133,8 @@
mapping = node.texture_mapping
+ layout.prop(mapping, "type", expand=True)
+
row = layout.row()
row.column().prop(mapping, "translation")
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list