Revision: 42823 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42823 Author: mont29 Date: 2011-12-22 13:26:51 +0000 (Thu, 22 Dec 2011) Log Message: ----------- Merged from trunk -r42685:42821.
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42685 Modified Paths: -------------- branches/vgroup_modifiers/CMakeLists.txt branches/vgroup_modifiers/SConstruct branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py branches/vgroup_modifiers/intern/audaspace/intern/AUD_SoftwareDevice.cpp branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp branches/vgroup_modifiers/intern/cycles/app/cycles_xml.cpp branches/vgroup_modifiers/intern/cycles/blender/addon/engine.py branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py branches/vgroup_modifiers/intern/cycles/blender/blender_camera.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_object.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_session.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_session.h branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp branches/vgroup_modifiers/intern/cycles/blender/blender_sync.h branches/vgroup_modifiers/intern/cycles/device/device.cpp branches/vgroup_modifiers/intern/cycles/device/device.h branches/vgroup_modifiers/intern/cycles/device/device_cpu.cpp branches/vgroup_modifiers/intern/cycles/device/device_cuda.cpp branches/vgroup_modifiers/intern/cycles/device/device_opencl.cpp branches/vgroup_modifiers/intern/cycles/kernel/CMakeLists.txt branches/vgroup_modifiers/intern/cycles/kernel/kernel.cl branches/vgroup_modifiers/intern/cycles/kernel/kernel.cpp branches/vgroup_modifiers/intern/cycles/kernel/kernel.cu branches/vgroup_modifiers/intern/cycles/kernel/kernel.h branches/vgroup_modifiers/intern/cycles/kernel/kernel_camera.h branches/vgroup_modifiers/intern/cycles/kernel/kernel_compat_opencl.h branches/vgroup_modifiers/intern/cycles/kernel/kernel_film.h branches/vgroup_modifiers/intern/cycles/kernel/kernel_optimized.cpp branches/vgroup_modifiers/intern/cycles/kernel/kernel_path.h branches/vgroup_modifiers/intern/cycles/kernel/kernel_random.h branches/vgroup_modifiers/intern/cycles/kernel/kernel_types.h branches/vgroup_modifiers/intern/cycles/render/buffers.cpp branches/vgroup_modifiers/intern/cycles/render/buffers.h branches/vgroup_modifiers/intern/cycles/render/camera.cpp branches/vgroup_modifiers/intern/cycles/render/graph.cpp branches/vgroup_modifiers/intern/cycles/render/graph.h branches/vgroup_modifiers/intern/cycles/render/integrator.cpp branches/vgroup_modifiers/intern/cycles/render/integrator.h branches/vgroup_modifiers/intern/cycles/render/nodes.cpp branches/vgroup_modifiers/intern/cycles/render/nodes.h branches/vgroup_modifiers/intern/cycles/render/session.cpp branches/vgroup_modifiers/intern/cycles/render/session.h branches/vgroup_modifiers/intern/cycles/render/tile.cpp branches/vgroup_modifiers/intern/cycles/render/tile.h branches/vgroup_modifiers/intern/cycles/util/util_math.h branches/vgroup_modifiers/intern/cycles/util/util_transform.h branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCocoa.mm branches/vgroup_modifiers/release/scripts/startup/bl_operators/clip.py branches/vgroup_modifiers/release/scripts/startup/bl_operators/sequencer.py branches/vgroup_modifiers/release/scripts/startup/bl_operators/uvcalc_smart_project.py branches/vgroup_modifiers/release/scripts/startup/bl_operators/wm.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_particle.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_scene.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_logic.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py branches/vgroup_modifiers/source/blender/blenfont/intern/blf_lang.c branches/vgroup_modifiers/source/blender/blenkernel/BKE_customdata.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_modifier.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h branches/vgroup_modifiers/source/blender/blenkernel/BKE_texture.h branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c branches/vgroup_modifiers/source/blender/blenkernel/intern/deform.c branches/vgroup_modifiers/source/blender/blenkernel/intern/dynamicpaint.c branches/vgroup_modifiers/source/blender/blenkernel/intern/idprop.c branches/vgroup_modifiers/source/blender/blenkernel/intern/ipo.c branches/vgroup_modifiers/source/blender/blenkernel/intern/modifier.c branches/vgroup_modifiers/source/blender/blenkernel/intern/movieclip.c branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c branches/vgroup_modifiers/source/blender/blenkernel/intern/unit.c branches/vgroup_modifiers/source/blender/blenlib/BLI_dynstr.h branches/vgroup_modifiers/source/blender/blenlib/BLI_math_vector.h branches/vgroup_modifiers/source/blender/blenlib/BLI_utildefines.h branches/vgroup_modifiers/source/blender/blenlib/CMakeLists.txt branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_dynstr.c branches/vgroup_modifiers/source/blender/blenlib/intern/bpath.c branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector.c branches/vgroup_modifiers/source/blender/blenlib/intern/path_util.c branches/vgroup_modifiers/source/blender/blenloader/CMakeLists.txt branches/vgroup_modifiers/source/blender/blenloader/SConscript branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c branches/vgroup_modifiers/source/blender/editors/include/ED_mesh.h branches/vgroup_modifiers/source/blender/editors/interface/interface.c branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c branches/vgroup_modifiers/source/blender/editors/interface/interface_panel.c branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c branches/vgroup_modifiers/source/blender/editors/mesh/editface.c branches/vgroup_modifiers/source/blender/editors/mesh/editmesh.c branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c branches/vgroup_modifiers/source/blender/editors/object/object_edit.c branches/vgroup_modifiers/source/blender/editors/object/object_intern.h branches/vgroup_modifiers/source/blender/editors/object/object_modifier.c branches/vgroup_modifiers/source/blender/editors/object/object_ops.c branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_ops.c branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c branches/vgroup_modifiers/source/blender/editors/space_node/node_buttons.c branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c branches/vgroup_modifiers/source/blender/editors/space_node/node_intern.h branches/vgroup_modifiers/source/blender/editors/space_node/node_ops.c branches/vgroup_modifiers/source/blender/editors/space_node/node_select.c branches/vgroup_modifiers/source/blender/editors/space_node/node_state.c branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_edit.c branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_select.c branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_header.c branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.c branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c branches/vgroup_modifiers/source/blender/editors/transform/transform_snap.c branches/vgroup_modifiers/source/blender/gpu/intern/gpu_extensions.c branches/vgroup_modifiers/source/blender/imbuf/CMakeLists.txt branches/vgroup_modifiers/source/blender/imbuf/intern/thumbs.c branches/vgroup_modifiers/source/blender/makesdna/DNA_mesh_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h branches/vgroup_modifiers/source/blender/makesdna/DNA_world_types.h branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_material.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mesh.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_movieclip.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object_api.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_userdef.c branches/vgroup_modifiers/source/blender/makesrna/intern/rna_world.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_solidify.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_uvproject.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvg_util.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgproximity.c branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_alphaOver.c branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_util.c branches/vgroup_modifiers/source/blender/python/generic/bgl.c branches/vgroup_modifiers/source/blender/python/generic/idprop_py_api.c branches/vgroup_modifiers/source/blender/python/generic/py_capi_utils.c branches/vgroup_modifiers/source/blender/python/intern/bpy_app_handlers.c branches/vgroup_modifiers/source/blender/python/intern/bpy_props.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_anim.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_array.c branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_callback.c branches/vgroup_modifiers/source/blender/python/intern/gpu.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils.h branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Color.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Euler.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Matrix.h branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Quaternion.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_Vector.h branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_geometry.c branches/vgroup_modifiers/source/blender/python/mathutils/mathutils_noise.c branches/vgroup_modifiers/source/blender/render/intern/source/external_engine.c branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_init_exit.c branches/vgroup_modifiers/source/creator/CMakeLists.txt branches/vgroup_modifiers/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.h branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertSensors.cpp branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.h branches/vgroup_modifiers/source/gameengine/Ketsji/KX_IPO_SGController.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.cpp branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp branches/vgroup_modifiers/source/tests/CMakeLists.txt Added Paths: ----------- branches/vgroup_modifiers/source/blender/blenlib/BLI_md5.h branches/vgroup_modifiers/source/blender/blenlib/intern/md5.c branches/vgroup_modifiers/source/tests/bl_pyapi_mathutils.py Removed Paths: ------------- branches/vgroup_modifiers/source/blender/imbuf/intern/md5.c branches/vgroup_modifiers/source/blender/imbuf/intern/md5.h Property Changed: ---------------- branches/vgroup_modifiers/ branches/vgroup_modifiers/source/blender/editors/space_outliner/ Property changes on: branches/vgroup_modifiers ___________________________________________________________________ Modified: svn:mergeinfo - /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42684 + /branches/soc-2011-cucumber:37517 /branches/soc-2011-tomato:42376,42378-42379,42397,42400 /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-42821 Modified: branches/vgroup_modifiers/CMakeLists.txt =================================================================== --- branches/vgroup_modifiers/CMakeLists.txt 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/CMakeLists.txt 2011-12-22 13:26:51 UTC (rev 42823) @@ -649,10 +649,6 @@ set(ICONV_LIBPATH ${ICONV}/lib) endif() - set(PNG "${LIBDIR}/png") - set(PNG_INCLUDE_DIR "${PNG}/include") - set(PNG_LIBPATH ${PNG}/lib) # not cmake defined - set(JPEG "${LIBDIR}/jpeg") set(JPEG_INCLUDE_DIR "${JPEG}/include") set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined @@ -727,12 +723,12 @@ set(GETTEXT_LIBRARIES gnu_gettext) endif() - if(CMAKE_CL_64) - set(PNG_LIBRARIES libpng) - else() - set(PNG_LIBRARIES libpng_st) - endif() + set(PNG_LIBRARIES libpng) set(JPEG_LIBRARIES libjpeg) + + set(PNG "${LIBDIR}/png") + set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include) if(CMAKE_CL_64) @@ -913,6 +909,10 @@ set(GETTEXT_LIBPATH ${GETTEXT}/lib) set(GETTEXT_LIBRARIES intl) endif() + + set(PNG "${LIBDIR}/gcc/png") + set(PNG_INCLUDE_DIR "${PNG}/include") + set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(JPEG_LIBRARIES libjpeg) set(PNG_LIBRARIES png) Modified: branches/vgroup_modifiers/SConstruct =================================================================== --- branches/vgroup_modifiers/SConstruct 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/SConstruct 2011-12-22 13:26:51 UTC (rev 42823) @@ -726,10 +726,6 @@ # For MinGW and linuxcross static linking will be used dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll'] - #currently win64-vc doesn't appear to have libpng.dll - if env['OURPLATFORM'] != 'win64-vc': - dllsources += ['${BF_PNG_LIBPATH}/libpng.dll'] - dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll'] # Used when linking to libtiff was dynamic # keep it here until compilation on all platform would be ok Modified: branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py 2011-12-22 13:26:51 UTC (rev 42823) @@ -64,7 +64,7 @@ BF_JPEG_LIBPATH = '${BF_JPEG}/lib' WITH_BF_PNG = True -BF_PNG = LIBDIR + '/png' +BF_PNG = LIBDIR + '/gcc/png' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' BF_PNG_LIBPATH = '${BF_PNG}/lib' Modified: branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py =================================================================== --- branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py 2011-12-22 13:26:51 UTC (rev 42823) @@ -72,7 +72,7 @@ WITH_BF_PNG = True BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' -BF_PNG_LIB = 'libpng_st' +BF_PNG_LIB = 'libpng' BF_PNG_LIBPATH = '${BF_PNG}/lib' WITH_BF_TIFF = True Modified: branches/vgroup_modifiers/intern/audaspace/intern/AUD_SoftwareDevice.cpp =================================================================== --- branches/vgroup_modifiers/intern/audaspace/intern/AUD_SoftwareDevice.cpp 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/intern/audaspace/intern/AUD_SoftwareDevice.cpp 2011-12-22 13:26:51 UTC (rev 42823) @@ -121,7 +121,9 @@ if(flags & AUD_RENDER_DISTANCE) { - if(m_device->m_distance_model == AUD_DISTANCE_MODEL_INVERSE_CLAMPED || m_device->m_distance_model == AUD_DISTANCE_MODEL_LINEAR_CLAMPED || m_device->m_distance_model == AUD_DISTANCE_MODEL_EXPONENT_CLAMPED) + if(m_device->m_distance_model == AUD_DISTANCE_MODEL_INVERSE_CLAMPED || + m_device->m_distance_model == AUD_DISTANCE_MODEL_LINEAR_CLAMPED || + m_device->m_distance_model == AUD_DISTANCE_MODEL_EXPONENT_CLAMPED) { distance = AUD_MAX(AUD_MIN(m_distance_max, distance), m_distance_reference); } Modified: branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp =================================================================== --- branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/intern/cycles/app/cycles_test.cpp 2011-12-22 13:26:51 UTC (rev 42823) @@ -82,10 +82,21 @@ session_print(status); } +static BufferParams& session_buffer_params() +{ + static BufferParams buffer_params; + buffer_params.width = options.width; + buffer_params.height = options.height; + buffer_params.full_width = options.width; + buffer_params.full_height = options.height; + + return buffer_params; +} + static void session_init() { options.session = new Session(options.session_params); - options.session->reset(options.width, options.height, options.session_params.samples); + options.session->reset(session_buffer_params(), options.session_params.samples); options.session->scene = options.scene; if(options.session_params.background && !options.quiet) @@ -151,7 +162,7 @@ static void display() { - options.session->draw(options.width, options.height); + options.session->draw(session_buffer_params()); display_info(options.session->progress); } @@ -162,13 +173,13 @@ options.height= height; if(options.session) - options.session->reset(options.width, options.height, options.session_params.samples); + options.session->reset(session_buffer_params(), options.session_params.samples); } void keyboard(unsigned char key) { if(key == 'r') - options.session->reset(options.width, options.height, options.session_params.samples); + options.session->reset(session_buffer_params(), options.session_params.samples); else if(key == 27) // escape options.session->progress.set_cancel("Cancelled"); } Modified: branches/vgroup_modifiers/intern/cycles/app/cycles_xml.cpp =================================================================== --- branches/vgroup_modifiers/intern/cycles/app/cycles_xml.cpp 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/intern/cycles/app/cycles_xml.cpp 2011-12-22 13:26:51 UTC (rev 42823) @@ -258,7 +258,6 @@ xml_read_int(&integrator->min_bounce, node, "min_bounce"); xml_read_int(&integrator->max_bounce, node, "max_bounce"); xml_read_bool(&integrator->no_caustics, node, "no_caustics"); - xml_read_float(&integrator->blur_caustics, node, "blur_caustics"); } /* Camera */ Modified: branches/vgroup_modifiers/intern/cycles/blender/addon/engine.py =================================================================== --- branches/vgroup_modifiers/intern/cycles/blender/addon/engine.py 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/intern/cycles/blender/addon/engine.py 2011-12-22 13:26:51 UTC (rev 42823) @@ -62,11 +62,7 @@ def update(engine, data, scene): import bcycles - if scene.render.use_border: - engine.report({'ERROR'}, "Border rendering not supported yet") - free(engine) - else: - bcycles.sync(engine.session) + bcycles.sync(engine.session) def draw(engine, region, v3d, rv3d): Modified: branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py =================================================================== --- branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/intern/cycles/blender/addon/ui.py 2011-12-22 13:26:51 UTC (rev 42823) @@ -160,18 +160,17 @@ scene = context.scene rd = scene.render - # row = layout.row() - # row.template_list(rd, "layers", rd.layers, "active_index", rows=2) + row = layout.row() + row.template_list(rd, "layers", rd.layers, "active_index", rows=2) - # col = row.column(align=True) - # col.operator("scene.render_layer_add", icon='ZOOMIN', text="") - # col.operator("scene.render_layer_remove", icon='ZOOMOUT', text="") + col = row.column(align=True) + col.operator("scene.render_layer_add", icon='ZOOMIN', text="") + col.operator("scene.render_layer_remove", icon='ZOOMOUT', text="") row = layout.row() - # rl = rd.layers.active - rl = rd.layers[0] + rl = rd.layers.active row.prop(rl, "name") - #row.prop(rd, "use_single_layer", text="", icon_only=True) + row.prop(rd, "use_single_layer", text="", icon_only=True) split = layout.split() @@ -183,6 +182,7 @@ layout.separator() + rl = rd.layers[0] layout.prop(rl, "material_override", text="Material") Modified: branches/vgroup_modifiers/intern/cycles/blender/blender_camera.cpp =================================================================== --- branches/vgroup_modifiers/intern/cycles/blender/blender_camera.cpp 2011-12-22 11:06:41 UTC (rev 42822) +++ branches/vgroup_modifiers/intern/cycles/blender/blender_camera.cpp 2011-12-22 13:26:51 UTC (rev 42823) @@ -207,6 +207,7 @@ /* transform, note the blender camera points along the negative z-axis */ cam->matrix = bcam->matrix * transform_scale(1.0f, 1.0f, -1.0f); + cam->matrix = transform_clear_scale(cam->matrix); /* set update flag */ if(cam->modified(prevcam)) @@ -286,5 +287,29 @@ blender_camera_sync(scene->camera, &bcam, width, height); } +BufferParams BlenderSync::get_buffer_params(BL::Scene b_scene, BL::RegionView3D b_rv3d, int width, int height) +{ + BufferParams params; + + params.full_width = width; + params.full_height = height; + + /* border render */ + BL::RenderSettings r = b_scene.render(); + + if(!b_rv3d && r.use_border()) { + params.full_x = r.border_min_x()*width; + params.full_y = r.border_min_y()*height; + params.width = (int)(r.border_max_x()*width) - params.full_x; @@ 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