[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60765] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Tue Oct 15 03:46:09 CEST 2013


Revision: 60765
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60765
Author:   gdh
Date:     2013-10-15 01:46:05 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60654 to r60764.

I had tree conflicts on this particular merge. I made sure everything
built correctly, so I don't foresee a problem. Let me know if there is.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60654
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60764

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/build_files/scons/tools/btools.py
    branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
    branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_hair_bsdf.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/soc-2013-cycles_mblur/intern/cycles/render/CMakeLists.txt
    branches/soc-2013-cycles_mblur/intern/cycles/render/shader.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/shader.h
    branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
    branches/soc-2013-cycles_mblur/intern/guardedalloc/CMakeLists.txt
    branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2013-cycles_mblur/intern/guardedalloc/SConscript
    branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c
    branches/soc-2013-cycles_mblur/intern/guardedalloc/mmap_win.h
    branches/soc-2013-cycles_mblur/intern/opencolorio/ocio_impl_glsl.cc
    branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/rna_keymap_ui.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_render_layer.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-cycles_mblur/release/scripts/templates_py/custom_nodes.py
    branches/soc-2013-cycles_mblur/source/blender/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/SConscript
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_deform.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/SConscript
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/armature.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/deform.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_bitmap.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_threads.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_heap.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/noise.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/threads.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/BIF_retarget.h
    branches/soc-2013-cycles_mblur/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve_add.c
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mask.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_transform.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_eyedropper.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mask/SConscript
    branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_bevel.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_bisect.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_extrude.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_inset.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_shapekey.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-cycles_mblur/source/blender/editors/screen/glutil.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/SConscript
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/fsmenu.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/SConscript
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/space_image.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_edit.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_templates.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_autocomplete.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.h
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_input.c
    branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/util/ed_util.c
    branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2013-cycles_mblur/source/blender/imbuf/SConscript
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/filetype.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/indexer.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/oiio/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/oiio/SConscript
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/tiff.c
    branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/util.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_node_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_space_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/SConscript
    branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_define.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/SConscript
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/SConscript
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_define.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2013-cycles_mblur/source/blender/python/intern/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Vector.h
    branches/soc-2013-cycles_mblur/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2013-cycles_mblur/source/blender/render/intern/include/render_types.h
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/bake.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/imagetexture.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/pixelshading.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/rendercore.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/shadeinput.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/sss.c
    branches/soc-2013-cycles_mblur/source/blender/render/intern/source/volume_precache.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_keymap.h
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2013-cycles_mblur/source/creator/creator.c
    branches/soc-2013-cycles_mblur/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_BlenderMaterial.cpp

Added Paths:
-----------
    branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn_guarded_impl.c
    branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn_intern.h
    branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn_lockfree_impl.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_task.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/task.c

Removed Paths:
-------------
    branches/soc-2013-cycles_mblur/intern/cycles/render/bssrdf.h

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/


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,60105
/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
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60653
   + /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,59942,60073,60094,60096,60105
/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
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60764

Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-10-15 00:24:53 UTC (rev 60764)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-10-15 01:46:05 UTC (rev 60765)
@@ -203,10 +203,10 @@
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
+option(WITH_OPENIMAGEIO         "Enable OpenImageIO Support (http://www.openimageio.org)" OFF)
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
 option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
-option(WITH_IMAGE_PSD           "Enable Photoshop PSD Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
@@ -287,9 +287,6 @@
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
-option(WITH_GUARDEDALLOC "Enable GuardedAlloc (DISABLE AT OWN RISK!)" ON)
-mark_as_advanced(WITH_GUARDEDALLOC)
-
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
@@ -442,11 +439,6 @@
 	set(WITH_CYCLES OFF)
 endif()
 
-# auto enable openimageio for photoshop psd
-if(WITH_IMAGE_PSD)
-	set(WITH_OPENIMAGEIO ON)
-endif()
-
 # enable boost for cycles, booleans, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)
@@ -2296,6 +2288,7 @@
 	info_cfg_option(WITH_SYSTEM_OPENJPEG)
 
 	info_cfg_text("Image Formats:")
+	info_cfg_option(WITH_OPENIMAGEIO)
 	info_cfg_option(WITH_IMAGE_CINEON)
 	info_cfg_option(WITH_IMAGE_DDS)
 	info_cfg_option(WITH_IMAGE_HDR)
@@ -2303,7 +2296,6 @@
 	info_cfg_option(WITH_IMAGE_OPENJPEG)
 	info_cfg_option(WITH_IMAGE_REDCODE)
 	info_cfg_option(WITH_IMAGE_TIFF)
-	info_cfg_option(WITH_IMAGE_PSD)
 
 	info_cfg_text("Audio:")
 	info_cfg_option(WITH_OPENAL)

Modified: branches/soc-2013-cycles_mblur/SConstruct
===================================================================
--- branches/soc-2013-cycles_mblur/SConstruct	2013-10-15 00:24:53 UTC (rev 60764)
+++ branches/soc-2013-cycles_mblur/SConstruct	2013-10-15 01:46:05 UTC (rev 60765)
@@ -290,13 +290,13 @@
     print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
     print "Available " + env['MACOSX_SDK_CHECK']
     if not 'Mac OS X 10.6' in env['MACOSX_SDK_CHECK']:
-        print  B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.7.sdk"
+        print  B.bc.OKGREEN + "Building with user-defined OS X SDK ( Xcode 4.4 or newer )"
     elif not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
         print  B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
     else:
         print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
 		
-    if env['CXX'].startswith('clang') and env['XCODE_CUR_VER'] >= '5':
+    if env['XCODE_CUR_VER'] >= '5' and not (env['CXX'][:-2].endswith('4.6') or env['CXX'][:-2].endswith('4.8')):
         env['CCFLAGS'].append('-ftemplate-depth=1024') # only valid for clang bundled with xcode 5
 
     # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake	2013-10-15 00:24:53 UTC (rev 60764)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake	2013-10-15 01:46:05 UTC (rev 60765)
@@ -585,7 +585,8 @@
 
 macro(get_blender_version)
 	# So cmake depends on BKE_blender.h, beware of inf-loops!
-	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
+	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h
+	               ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
 
 	file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$")
 

Modified: branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py	2013-10-15 00:24:53 UTC (rev 60764)
+++ branches/soc-2013-cycles_mblur/build_files/scons/tools/btools.py	2013-10-15 01:46:05 UTC (rev 60765)
@@ -576,7 +576,7 @@
         ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
 
         (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
-        (BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
+        (BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)),
         ('BF_OIIO', 'OIIO root path', ''),
         ('BF_OIIO_INC', 'OIIO include path', ''),
         ('BF_OIIO_LIB', 'OIIO library', ''),

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py	2013-10-15 00:24:53 UTC (rev 60764)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py	2013-10-15 01:46:05 UTC (rev 60765)
@@ -324,7 +324,7 @@
         rl = rd.layers.active
 
         row = layout.row()
-        row.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=2)
+        row.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=1)
 
         col = row.column(align=True)
         col.operator("scene.render_layer_add", icon='ZOOMIN', text="")
@@ -503,7 +503,7 @@
         if ob:
             row = layout.row()
 
-            row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=2)
+            row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=1)
 
             col = row.column(align=True)
             col.operator("object.material_slot_add", icon='ZOOMIN', text="")

Modified: branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp	2013-10-15 00:24:53 UTC (rev 60764)
+++ branches/soc-2013-cycles_mblur/intern/cycles/device/device.cpp	2013-10-15 01:46:05 UTC (rev 60765)
@@ -56,18 +56,6 @@
 {
 	pixels_copy_from(rgba, y, w, h);
 
-	GLuint texid;
-	glGenTextures(1, &texid);
-	glBindTexture(GL_TEXTURE_2D, texid);
-	if(rgba.data_type == TYPE_HALF)
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, w, h, 0, GL_RGBA, GL_HALF_FLOAT, (void*)rgba.data_pointer);
-	else
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (void*)rgba.data_pointer);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-	glEnable(GL_TEXTURE_2D);
-	
 	if(transparent) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -75,30 +63,57 @@
 
 	glColor3f(1.0f, 1.0f, 1.0f);
 
-	glPushMatrix();
-	glTranslatef(0.0f, (float)dy, 0.0f);
+	if(rgba.data_type == TYPE_HALF) {
+		/* draw half float texture, GLSL shader for display transform assumed to be bound */
+		GLuint texid;
+		glGenTextures(1, &texid);
+		glBindTexture(GL_TEXTURE_2D, texid);

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list