[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47469] branches/soc-2012-bratwurst: merge with trunk to resolve any unlikely mask transform conflicts with UV transform correction tool
Antony Riakiotakis
kalast at gmail.com
Tue Jun 5 17:30:57 CEST 2012
Revision: 47469
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47469
Author: psy-fi
Date: 2012-06-05 15:30:48 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
merge with trunk to resolve any unlikely mask transform conflicts with UV transform correction tool
Modified Paths:
--------------
branches/soc-2012-bratwurst/CMakeLists.txt
branches/soc-2012-bratwurst/intern/CMakeLists.txt
branches/soc-2012-bratwurst/intern/SConscript
branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
branches/soc-2012-bratwurst/intern/container/intern/CTR_List.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/addon/ui.py
branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp
branches/soc-2012-bratwurst/intern/cycles/blender/blender_util.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_emission.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_light.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_shader.h
branches/soc-2012-bratwurst/intern/cycles/kernel/kernel_types.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/background.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/bssrdf.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/debug.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/emissive.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_color.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/node_texture.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/nodes/stdosl.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_services.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/osl_shader.h
branches/soc-2012-bratwurst/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/soc-2012-bratwurst/intern/cycles/kernel/svm/emissive.h
branches/soc-2012-bratwurst/intern/cycles/render/light.cpp
branches/soc-2012-bratwurst/intern/cycles/render/light.h
branches/soc-2012-bratwurst/intern/cycles/util/util_math.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/soc-2012-bratwurst/intern/ghost/intern/GHOST_WindowNULL.h
branches/soc-2012-bratwurst/intern/ghost/test/multitest/EventToBuf.c
branches/soc-2012-bratwurst/intern/itasc/Armature.cpp
branches/soc-2012-bratwurst/intern/itasc/Armature.hpp
branches/soc-2012-bratwurst/intern/itasc/FixedObject.cpp
branches/soc-2012-bratwurst/intern/itasc/FixedObject.hpp
branches/soc-2012-bratwurst/intern/itasc/MovingFrame.cpp
branches/soc-2012-bratwurst/intern/itasc/MovingFrame.hpp
branches/soc-2012-bratwurst/intern/itasc/Object.hpp
branches/soc-2012-bratwurst/intern/itasc/Scene.cpp
branches/soc-2012-bratwurst/intern/memutil/MEM_Allocator.h
branches/soc-2012-bratwurst/intern/memutil/MEM_RefCountPtr.h
branches/soc-2012-bratwurst/intern/memutil/MEM_SmartPtr.h
branches/soc-2012-bratwurst/intern/mikktspace/mikktspace.c
branches/soc-2012-bratwurst/intern/utfconv/utfconv.c
branches/soc-2012-bratwurst/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_console.py
branches/soc-2012-bratwurst/source/blender/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_blender.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_context.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_image.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_library.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_main.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mesh.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_node.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_paint.h
branches/soc-2012-bratwurst/source/blender/blenkernel/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/blenkernel/SConscript
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/context.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/idcode.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/image.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/library.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mesh.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/multires.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/node.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/paint.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/particle_system.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/scene.c
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/math_color.c
branches/soc-2012-bratwurst/source/blender/blenlib/intern/string_utf8.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/readfile.c
branches/soc-2012-bratwurst/source/blender/blenloader/intern/writefile.c
branches/soc-2012-bratwurst/source/blender/collada/AnimationImporter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_BlurBaseOperation.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_GaussianBokehBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_ViewerBaseOperation.h
branches/soc-2012-bratwurst/source/blender/editors/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/SConscript
branches/soc-2012-bratwurst/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2012-bratwurst/source/blender/editors/animation/keyframes_draw.c
branches/soc-2012-bratwurst/source/blender/editors/armature/editarmature.c
branches/soc-2012-bratwurst/source/blender/editors/include/ED_clip.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_object.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_screen.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_transform.h
branches/soc-2012-bratwurst/source/blender/editors/include/UI_resources.h
branches/soc-2012-bratwurst/source/blender/editors/interface/interface_panel.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/object/object_ops.c
branches/soc-2012-bratwurst/source/blender/editors/render/render_internal.c
branches/soc-2012-bratwurst/source/blender/editors/screen/screen_ops.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2012-bratwurst/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2012-bratwurst/source/blender/editors/space_action/action_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_api/spacetypes.c
branches/soc-2012-bratwurst/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/clip_editor.c
branches/soc-2012-bratwurst/source/blender/editors/space_clip/space_clip.c
branches/soc-2012-bratwurst/source/blender/editors/space_console/console_intern.h
branches/soc-2012-bratwurst/source/blender/editors/space_console/console_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_console/space_console.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_buttons.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/image_ops.c
branches/soc-2012-bratwurst/source/blender/editors/space_image/space_image.c
branches/soc-2012-bratwurst/source/blender/editors/space_nla/nla_draw.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/drawnode.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/node_select.c
branches/soc-2012-bratwurst/source/blender/editors/space_node/space_node.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2012-bratwurst/source/blender/editors/space_outliner/space_outliner.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_generics.c
branches/soc-2012-bratwurst/source/blender/editors/transform/transform_ops.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2012-bratwurst/source/blender/gpu/intern/gpu_material.c
branches/soc-2012-bratwurst/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_ID.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_image_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_node_types.h
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_scene_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/makesdna/intern/makesdna.c
branches/soc-2012-bratwurst/source/blender/makesrna/RNA_access.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/makesrna/intern/makesrna.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_ID.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_internal.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_main.c
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_main_api.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_scene.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_explode.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_remesh.c
branches/soc-2012-bratwurst/source/blender/modifiers/intern/MOD_solidify.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/node_composite_util.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/node_composite_util.h
branches/soc-2012-bratwurst/source/blender/nodes/intern/node_common.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2012-bratwurst/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2012-bratwurst/source/blender/python/intern/bpy_library.c
branches/soc-2012-bratwurst/source/blender/render/intern/source/render_texture.c
branches/soc-2012-bratwurst/source/blender/windowmanager/WM_types.h
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/gameengine/Ketsji/KX_Scene.cpp
Added Paths:
-----------
branches/soc-2012-bratwurst/intern/raskter/
branches/soc-2012-bratwurst/intern/raskter/CMakeLists.txt
branches/soc-2012-bratwurst/intern/raskter/SConscript
branches/soc-2012-bratwurst/intern/raskter/raskter.c
branches/soc-2012-bratwurst/intern/raskter/raskter.h
branches/soc-2012-bratwurst/source/blender/blenkernel/BKE_mask.h
branches/soc-2012-bratwurst/source/blender/blenkernel/intern/mask.c
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MaskNode.cpp
branches/soc-2012-bratwurst/source/blender/compositor/nodes/COM_MaskNode.h
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2012-bratwurst/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2012-bratwurst/source/blender/editors/include/ED_mask.h
branches/soc-2012-bratwurst/source/blender/editors/mask/
branches/soc-2012-bratwurst/source/blender/editors/mask/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/mask/SConscript
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_edit.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_intern.h
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_ops.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_shapekey.c
branches/soc-2012-bratwurst/source/blender/makesdna/DNA_mask_types.h
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_mask.c
branches/soc-2012-bratwurst/source/blender/nodes/composite/nodes/node_composite_mask.c
Removed Paths:
-------------
branches/soc-2012-bratwurst/intern/raskter/CMakeLists.txt
branches/soc-2012-bratwurst/intern/raskter/SConscript
branches/soc-2012-bratwurst/intern/raskter/raskter.c
branches/soc-2012-bratwurst/intern/raskter/raskter.h
branches/soc-2012-bratwurst/source/blender/editors/mask/CMakeLists.txt
branches/soc-2012-bratwurst/source/blender/editors/mask/SConscript
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_edit.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_intern.h
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_ops.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_relationships.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_select.c
branches/soc-2012-bratwurst/source/blender/editors/mask/mask_shapekey.c
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
/trunk/blender:46808-47382
+ /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
/trunk/blender:46808-47468
Modified: branches/soc-2012-bratwurst/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/CMakeLists.txt 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/CMakeLists.txt 2012-06-05 15:30:48 UTC (rev 47469)
@@ -1,3 +1,4 @@
+set(Boost_DEBUG TRUE)
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -237,6 +238,7 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
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")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
@@ -647,10 +649,17 @@
find_package(OpenImageIO)
- set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
+ set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere
set(OPENIMAGEIO_DEFINITIONS)
+ if(WITH_IMAGE_TIFF)
+ list(APPEND OPENIMAGEIO_LIBRARIES "${TIFF_LIBRARY}")
+ endif()
+ if(WITH_IMAGE_OPENEXR)
+ list(APPEND OPENIMAGEIO_LIBRARIES "${OPENEXR_LIBRARIES}")
+ endif()
+
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
set(WITH_CYCLES OFF)
Modified: branches/soc-2012-bratwurst/intern/CMakeLists.txt
===================================================================
--- branches/soc-2012-bratwurst/intern/CMakeLists.txt 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/CMakeLists.txt 2012-06-05 15:30:48 UTC (rev 47469)
@@ -31,6 +31,7 @@
add_subdirectory(iksolver)
add_subdirectory(opennl)
add_subdirectory(mikktspace)
+add_subdirectory(raskter)
if(WITH_AUDASPACE)
add_subdirectory(audaspace)
Modified: branches/soc-2012-bratwurst/intern/SConscript
===================================================================
--- branches/soc-2012-bratwurst/intern/SConscript 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/SConscript 2012-06-05 15:30:48 UTC (rev 47469)
@@ -14,7 +14,8 @@
'boolop/SConscript',
'opennl/SConscript',
'mikktspace/SConscript',
- 'smoke/SConscript'])
+ 'smoke/SConscript',
+ 'raskter/SConscript'])
if env ['WITH_BF_REMESH']:
SConscript(['dualcon/SConscript'])
Modified: branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
===================================================================
--- branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh_CFIterator.h 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/bsp/intern/BSP_CSGMesh_CFIterator.h 2012-06-05 15:30:48 UTC (rev 47469)
@@ -127,10 +127,10 @@
BSP_CSGMesh_VertexIt * v_it = new BSP_CSGMesh_VertexIt;
v_it->mesh = mesh;
- if( output->num_elements > 0 )
+ if ( output->num_elements > 0 )
v_it->pos = &mesh->VertexSet()[0];
output->it = v_it;
-};
+}
/**
Modified: branches/soc-2012-bratwurst/intern/container/intern/CTR_List.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/container/intern/CTR_List.cpp 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/container/intern/CTR_List.cpp 2012-06-05 15:30:48 UTC (rev 47469)
@@ -33,118 +33,95 @@
#include "CTR_List.h"
-CTR_Link::
-CTR_Link(
-) :
+CTR_Link::CTR_Link() :
m_next(0),
m_prev(0)
{
}
-CTR_Link::
-CTR_Link(
- CTR_Link *next,
- CTR_Link *prev
-) :
+CTR_Link::CTR_Link(CTR_Link *next, CTR_Link *prev) :
m_next(next),
m_prev(prev)
{
}
- CTR_Link *
-CTR_Link::
-getNext(
-) const {
+CTR_Link *
+CTR_Link::getNext() const
+{
return m_next;
}
- CTR_Link *
-CTR_Link::
-getPrev(
-) const {
+CTR_Link *
+CTR_Link::getPrev() const
+{
return m_prev;
}
- bool
-CTR_Link::
-isHead(
-) const {
+bool
+CTR_Link::isHead() const
+{
return m_prev == 0;
}
- bool
-CTR_Link::
-isTail(
-) const {
+bool
+CTR_Link::isTail() const
+{
return m_next == 0;
}
- void
-CTR_Link::
-insertBefore(
- CTR_Link *link
-) {
- m_next = link;
- m_prev = link->m_prev;
- m_next->m_prev = this;
- m_prev->m_next = this;
+void
+CTR_Link::insertBefore(CTR_Link *link)
+{
+ m_next = link;
+ m_prev = link->m_prev;
+ m_next->m_prev = this;
+ m_prev->m_next = this;
}
- void
-CTR_Link::
-insertAfter(
- CTR_Link *link
-) {
- m_next = link->m_next;
- m_prev = link;
- m_next->m_prev = this;
- m_prev->m_next = this;
+void
+CTR_Link::insertAfter(CTR_Link *link)
+{
+ m_next = link->m_next;
+ m_prev = link;
+ m_next->m_prev = this;
+ m_prev->m_next = this;
}
- void
-CTR_Link::
-remove(
-) {
- m_next->m_prev = m_prev;
- m_prev->m_next = m_next;
+void
+CTR_Link::remove()
+{
+ m_next->m_prev = m_prev;
+ m_prev->m_next = m_next;
}
-CTR_List::
-CTR_List(
-) :
+CTR_List::CTR_List() :
m_head(&m_tail, 0),
m_tail(0, &m_head)
{
}
- CTR_Link *
-CTR_List::
-getHead(
-) const {
+CTR_Link *
+CTR_List:: getHead() const
+{
return m_head.getNext();
}
- CTR_Link *
-CTR_List::
-getTail(
-) const {
+CTR_Link *
+CTR_List::getTail() const
+{
return m_tail.getPrev();
}
- void
-CTR_List::
-addHead(
- CTR_Link *link
-) {
+void
+CTR_List::addHead(CTR_Link *link)
+{
link->insertAfter(&m_head);
}
- void
-CTR_List::
-addTail(
- CTR_Link *link
-) {
+void
+CTR_List::addTail(CTR_Link *link)
+{
link->insertBefore(&m_tail);
}
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/addon/ui.py 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/cycles/blender/addon/ui.py 2012-06-05 15:30:48 UTC (rev 47469)
@@ -488,9 +488,7 @@
col = split.column()
col.prop(clamp, "cast_shadow")
- if lamp.type == 'SPOT':
- layout.label(text="Not supported, interpreted as point lamp.")
- elif lamp.type == 'HEMI':
+ if lamp.type == 'HEMI':
layout.label(text="Not supported, interpreted as sun lamp.")
@@ -509,7 +507,30 @@
if not panel_node_draw(layout, lamp, 'OUTPUT_LAMP', 'Surface'):
layout.prop(lamp, "color")
+class CyclesLamp_PT_spot(CyclesButtonsPanel, Panel):
+ bl_label = "Spot Shape"
+ bl_context = "data"
+ @classmethod
+ def poll(cls, context):
+ lamp = context.lamp
+ return (lamp and lamp.type == 'SPOT') and CyclesButtonsPanel.poll(context)
+
+ def draw(self, context):
+ layout = self.layout
+
+ lamp = context.lamp
+
+ split = layout.split()
+
+ col = split.column()
+ sub = col.column()
+ sub.prop(lamp, "spot_size", text="Size")
+ sub.prop(lamp, "spot_blend", text="Blend", slider=True)
+
+ col = split.column()
+ col.prop(lamp, "show_cone")
+
class CyclesWorld_PT_surface(CyclesButtonsPanel, Panel):
bl_label = "Surface"
bl_context = "world"
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/cycles/blender/blender_object.cpp 2012-06-05 15:30:48 UTC (rev 47469)
@@ -106,7 +106,9 @@
case BL::Lamp::type_SPOT: {
BL::SpotLamp b_spot_lamp(b_lamp);
light->size = b_spot_lamp.shadow_soft_size();
- light->type = LIGHT_POINT;
+ light->type = LIGHT_SPOT;
+ light->spot_angle = b_spot_lamp.spot_size();
+ light->spot_smooth = b_spot_lamp.spot_blend();
break;
}
case BL::Lamp::type_HEMI: {
Modified: branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp 2012-06-05 14:39:38 UTC (rev 47468)
+++ branches/soc-2012-bratwurst/intern/cycles/blender/blender_shader.cpp 2012-06-05 15:30:48 UTC (rev 47469)
@@ -106,7 +106,7 @@
mapping->max = get_float3(b_mapping.max());
}
-static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNode b_node)
+static ShaderNode *add_node(BL::BlendData b_data, BL::Scene b_scene, ShaderGraph *graph, BL::ShaderNode b_node)
{
ShaderNode *node = NULL;
@@ -343,7 +343,7 @@
ImageTextureNode *image = new ImageTextureNode();
/* todo: handle generated/builtin images */
if(b_image)
- image->filename = blender_absolute_path(b_data, b_image, b_image.filepath());
+ image->filename = image_user_file_path(b_image_node.image_user(), b_image, b_scene.frame_current());
image->color_space = ImageTextureNode::color_space_enum[(int)b_image_node.color_space()];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list