[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27667] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27654 :27666
Brecht Van Lommel
brecht at blender.org
Mon Mar 22 18:46:49 CET 2010
Revision: 27667
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27667
Author: blendix
Date: 2010-03-22 18:46:49 +0100 (Mon, 22 Mar 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27654:27666
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_material.py
branches/render25/release/scripts/ui/space_view3d_toolbar.py
branches/render25/source/blender/avi/AVI_avi.h
branches/render25/source/blender/avi/intern/avi.c
branches/render25/source/blender/avi/intern/codecs.c
branches/render25/source/blender/avi/intern/mjpeg.c
branches/render25/source/blender/avi/intern/options.c
branches/render25/source/blender/blenkernel/BKE_DerivedMesh.h
branches/render25/source/blender/blenkernel/BKE_bmesh.h
branches/render25/source/blender/blenkernel/BKE_booleanops.h
branches/render25/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/render25/source/blender/blenkernel/BKE_context.h
branches/render25/source/blender/blenkernel/BKE_customdata.h
branches/render25/source/blender/blenkernel/BKE_displist.h
branches/render25/source/blender/blenkernel/BKE_idprop.h
branches/render25/source/blender/blenkernel/BKE_lattice.h
branches/render25/source/blender/blenkernel/BKE_modifier.h
branches/render25/source/blender/blenkernel/BKE_paint.h
branches/render25/source/blender/blenkernel/BKE_softbody.h
branches/render25/source/blender/blenkernel/BKE_subsurf.h
branches/render25/source/blender/blenkernel/intern/BME_Customdata.c
branches/render25/source/blender/blenkernel/intern/BME_eulers.c
branches/render25/source/blender/blenkernel/intern/BME_mesh.c
branches/render25/source/blender/blenkernel/intern/CCGSubSurf.c
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/anim_sys.c
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/bmfont.c
branches/render25/source/blender/blenkernel/intern/booleanops.c
branches/render25/source/blender/blenkernel/intern/brush.c
branches/render25/source/blender/blenkernel/intern/bvhutils.c
branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
branches/render25/source/blender/blenkernel/intern/cloth.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/curve.c
branches/render25/source/blender/blenkernel/intern/customdata.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/effect.c
branches/render25/source/blender/blenkernel/intern/exotic.c
branches/render25/source/blender/blenkernel/intern/fluidsim.c
branches/render25/source/blender/blenkernel/intern/fmodifier.c
branches/render25/source/blender/blenkernel/intern/font.c
branches/render25/source/blender/blenkernel/intern/idprop.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/image_gen.c
branches/render25/source/blender/blenkernel/intern/ipo.c
branches/render25/source/blender/blenkernel/intern/key.c
branches/render25/source/blender/blenkernel/intern/lattice.c
branches/render25/source/blender/blenkernel/intern/library.c
branches/render25/source/blender/blenkernel/intern/material.c
branches/render25/source/blender/blenkernel/intern/mball.c
branches/render25/source/blender/blenkernel/intern/mesh.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/multires.c
branches/render25/source/blender/blenkernel/intern/node.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/particle.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/sca.c
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/seqeffects.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/smoke.c
branches/render25/source/blender/blenkernel/intern/softbody.c
branches/render25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/render25/source/blender/blenkernel/intern/text.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenkernel/intern/world.c
branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
branches/render25/source/blender/blenkernel/intern/writeframeserver.c
branches/render25/source/blender/blenlib/BLI_math_vector.h
branches/render25/source/blender/blenlib/BLI_pbvh.h
branches/render25/source/blender/blenlib/BLI_vfontdata.h
branches/render25/source/blender/blenlib/intern/BLI_bfile.c
branches/render25/source/blender/blenlib/intern/BLI_ghash.c
branches/render25/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/render25/source/blender/blenlib/intern/BLI_linklist.c
branches/render25/source/blender/blenlib/intern/boxpack2d.c
branches/render25/source/blender/blenlib/intern/bpath.c
branches/render25/source/blender/blenlib/intern/dynamiclist.c
branches/render25/source/blender/blenlib/intern/edgehash.c
branches/render25/source/blender/blenlib/intern/fnmatch.c
branches/render25/source/blender/blenlib/intern/freetypefont.c
branches/render25/source/blender/blenlib/intern/math_base.c
branches/render25/source/blender/blenlib/intern/math_color.c
branches/render25/source/blender/blenlib/intern/math_geom.c
branches/render25/source/blender/blenlib/intern/math_matrix.c
branches/render25/source/blender/blenlib/intern/math_rotation.c
branches/render25/source/blender/blenlib/intern/math_vector_inline.c
branches/render25/source/blender/blenlib/intern/noise.c
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/blenlib/intern/pbvh.c
branches/render25/source/blender/blenlib/intern/scanfill.c
branches/render25/source/blender/blenlib/intern/storage.c
branches/render25/source/blender/blenlib/intern/string.c
branches/render25/source/blender/blenlib/intern/voxel.c
branches/render25/source/blender/blenlib/intern/winstuff.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/animation/anim_filter.c
branches/render25/source/blender/editors/animation/anim_markers.c
branches/render25/source/blender/editors/animation/keyframes_edit.c
branches/render25/source/blender/editors/animation/keyframes_general.c
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/armature/meshlaplacian.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/curve/curve_intern.h
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/include/ED_anim_api.h
branches/render25/source/blender/editors/include/ED_numinput.h
branches/render25/source/blender/editors/include/ED_sculpt.h
branches/render25/source/blender/editors/include/UI_interface.h
branches/render25/source/blender/editors/include/UI_resources.h
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_layout.c
branches/render25/source/blender/editors/interface/interface_panel.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/interface_widgets.c
branches/render25/source/blender/editors/mesh/editface.c
branches/render25/source/blender/editors/mesh/editmesh_lib.c
branches/render25/source/blender/editors/mesh/editmesh_loop.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/mesh_data.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/metaball/mball_edit.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_lattice.c
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/physics/physics_fluid.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/glutil.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/screen/screendump.c
branches/render25/source/blender/editors/sculpt_paint/paint_image.c
branches/render25/source/blender/editors/sculpt_paint/paint_intern.h
branches/render25/source/blender/editors/sculpt_paint/paint_ops.c
branches/render25/source/blender/editors/sculpt_paint/paint_stroke.c
branches/render25/source/blender/editors/sculpt_paint/paint_utils.c
branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/space_action/space_action.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_console/console_ops.c
branches/render25/source/blender/editors/space_console/console_report.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/fsmenu.h
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_nla/space_nla.c
branches/render25/source/blender/editors/space_node/drawnode.c
branches/render25/source/blender/editors/space_node/node_select.c
branches/render25/source/blender/editors/space_node/space_node.c
branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/render25/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_text/text_draw.c
branches/render25/source/blender/editors/space_text/text_header.c
branches/render25/source/blender/editors/space_text/text_intern.h
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_view3d/drawarmature.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_header.c
branches/render25/source/blender/editors/space_view3d/view3d_ops.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/editors/space_view3d/view3d_snap.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform.h
branches/render25/source/blender/editors/transform/transform_constraints.c
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/editors/transform/transform_ndofinput.c
branches/render25/source/blender/editors/transform/transform_ops.c
branches/render25/source/blender/editors/transform/transform_orientations.c
branches/render25/source/blender/editors/util/numinput.c
branches/render25/source/blender/editors/util/undo.c
branches/render25/source/blender/editors/uvedit/uvedit_draw.c
branches/render25/source/blender/editors/uvedit/uvedit_ops.c
branches/render25/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/render25/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/render25/source/blender/gpu/GPU_extensions.h
branches/render25/source/blender/gpu/gpu_buffers.h
branches/render25/source/blender/gpu/intern/gpu_buffers.c
branches/render25/source/blender/gpu/intern/gpu_codegen.c
branches/render25/source/blender/gpu/intern/gpu_codegen.h
branches/render25/source/blender/gpu/intern/gpu_draw.c
branches/render25/source/blender/gpu/intern/gpu_extensions.c
branches/render25/source/blender/gpu/intern/gpu_material.c
branches/render25/source/blender/imbuf/intern/IMB_anim.h
branches/render25/source/blender/imbuf/intern/IMB_imginfo.h
branches/render25/source/blender/imbuf/intern/allocimbuf.c
branches/render25/source/blender/imbuf/intern/anim.c
branches/render25/source/blender/imbuf/intern/anim5.c
branches/render25/source/blender/imbuf/intern/bmp.c
branches/render25/source/blender/imbuf/intern/data.c
branches/render25/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/render25/source/blender/imbuf/intern/divers.c
branches/render25/source/blender/imbuf/intern/jp2.c
branches/render25/source/blender/imbuf/intern/jpeg.c
branches/render25/source/blender/imbuf/intern/md5.c
branches/render25/source/blender/imbuf/intern/md5.h
branches/render25/source/blender/imbuf/intern/png.c
branches/render25/source/blender/imbuf/intern/radiance_hdr.c
branches/render25/source/blender/imbuf/intern/readimage.c
branches/render25/source/blender/imbuf/intern/scaling.c
branches/render25/source/blender/imbuf/intern/targa.c
branches/render25/source/blender/imbuf/intern/tiff.c
branches/render25/source/blender/imbuf/intern/util.c
branches/render25/source/blender/makesdna/DNA_ID.h
branches/render25/source/blender/makesdna/DNA_action_types.h
branches/render25/source/blender/makesdna/DNA_camera_types.h
branches/render25/source/blender/makesdna/DNA_cloth_types.h
branches/render25/source/blender/makesdna/DNA_constraint_types.h
branches/render25/source/blender/makesdna/DNA_lamp_types.h
branches/render25/source/blender/makesdna/DNA_modifier_types.h
branches/render25/source/blender/makesdna/DNA_object_force.h
branches/render25/source/blender/makesdna/DNA_object_types.h
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesdna/DNA_screen_types.h
branches/render25/source/blender/makesdna/DNA_sdna_types.h
branches/render25/source/blender/makesdna/DNA_sensor_types.h
branches/render25/source/blender/makesdna/DNA_sequence_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesdna/DNA_texture_types.h
branches/render25/source/blender/makesdna/DNA_vec_types.h
branches/render25/source/blender/makesdna/DNA_view3d_types.h
branches/render25/source/blender/makesdna/intern/makesdna.c
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/intern/makesrna.c
branches/render25/source/blender/makesrna/intern/rna_access.c
branches/render25/source/blender/makesrna/intern/rna_brush.c
branches/render25/source/blender/makesrna/intern/rna_color.c
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_fluidsim.c
branches/render25/source/blender/makesrna/intern/rna_image.c
branches/render25/source/blender/makesrna/intern/rna_key.c
branches/render25/source/blender/makesrna/intern/rna_lamp.c
branches/render25/source/blender/makesrna/intern/rna_main.c
branches/render25/source/blender/makesrna/intern/rna_material.c
branches/render25/source/blender/makesrna/intern/rna_mesh.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_object_api.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/render25/source/blender/makesrna/intern/rna_smoke.c
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/makesrna/intern/rna_userdef.c
branches/render25/source/blender/makesrna/intern/rna_wm.c
branches/render25/source/blender/makesrna/intern/rna_wm_api.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
branches/render25/source/blender/nodes/intern/CMP_util.c
branches/render25/source/blender/nodes/intern/CMP_util.h
branches/render25/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
branches/render25/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/render25/source/blender/nodes/intern/TEX_util.c
branches/render25/source/blender/python/BPY_extern.h
branches/render25/source/blender/python/generic/Geometry.c
branches/render25/source/blender/python/generic/Mathutils.c
branches/render25/source/blender/python/generic/bgl.c
branches/render25/source/blender/python/generic/bpy_internal_import.c
branches/render25/source/blender/python/generic/euler.c
branches/render25/source/blender/python/generic/matrix.c
branches/render25/source/blender/python/generic/quat.c
branches/render25/source/blender/python/generic/vector.c
branches/render25/source/blender/python/intern/bpy.c
branches/render25/source/blender/python/intern/bpy_array.c
branches/render25/source/blender/python/intern/bpy_driver.c
branches/render25/source/blender/python/intern/bpy_props.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/python/intern/bpy_util.h
branches/render25/source/blender/quicktime/apple/quicktime_export.c
branches/render25/source/blender/quicktime/apple/quicktime_import.c
branches/render25/source/blender/readblenfile/test/test.c
branches/render25/source/blender/render/intern/include/rayobject.h
branches/render25/source/blender/render/intern/include/sunsky.h
branches/render25/source/blender/render/intern/source/convertblender.c
branches/render25/source/blender/render/intern/source/diskocclusion.c
branches/render25/source/blender/render/intern/source/halo.c
branches/render25/source/blender/render/intern/source/object_particle.c
branches/render25/source/blender/render/intern/source/pipeline.c
branches/render25/source/blender/render/intern/source/pixelfilter.c
branches/render25/source/blender/render/intern/source/sss.c
branches/render25/source/blender/render/intern/source/sunsky.c
branches/render25/source/blender/render/intern/source/texture_image.c
branches/render25/source/blender/render/intern/source/texture_pointdensity.c
branches/render25/source/blender/render/intern/source/texture_stack.c
branches/render25/source/blender/render/intern/source/texture_voxeldata.c
branches/render25/source/blender/render/intern/source/volume_precache.c
branches/render25/source/blender/render/intern/source/volumetric.c
branches/render25/source/blender/render/intern/source/zbuf.c
branches/render25/source/blender/verify/intern/BLO_verify.c
branches/render25/source/blender/windowmanager/intern/wm_apple.c
branches/render25/source/blender/windowmanager/intern/wm_cursors.c
branches/render25/source/blender/windowmanager/intern/wm_draw.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_gesture.c
branches/render25/source/blender/windowmanager/intern/wm_jobs.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/intern/wm_subwindow.c
branches/render25/source/blender/windowmanager/wm_draw.h
Modified: branches/render25/release/scripts/ui/properties_material.py
===================================================================
--- branches/render25/release/scripts/ui/properties_material.py 2010-03-22 17:25:29 UTC (rev 27666)
+++ branches/render25/release/scripts/ui/properties_material.py 2010-03-22 17:46:49 UTC (rev 27667)
@@ -23,7 +23,19 @@
narrowui = 180
+def active_node_mat(mat):
+ # TODO, 2.4x has a pipeline section, for 2.5 we need to communicate
+ # which settings from node-materials are used
+ if mat:
+ mat_node = mat.active_node_material
+ if mat_node:
+ return mat_node
+ else:
+ return mat
+ return None
+
+
class MATERIAL_MT_sss_presets(bpy.types.Menu):
bl_label = "SSS Presets"
preset_subdir = "sss"
@@ -136,14 +148,14 @@
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
wide_ui = context.region.width > narrowui
if mat.type in ('SURFACE', 'WIRE'):
@@ -247,14 +259,14 @@
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
wide_ui = context.region.width > narrowui
split = layout.split()
@@ -293,14 +305,14 @@
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
wide_ui = context.region.width > narrowui
split = layout.split()
@@ -330,14 +342,14 @@
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
wide_ui = context.region.width > narrowui
split = layout.split()
@@ -401,14 +413,14 @@
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
wide_ui = context.region.width > narrowui
layout.active = (not mat.shadeless)
@@ -471,12 +483,12 @@
COMPAT_ENGINES = {'BLENDER_RENDER'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
def draw_header(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
sss = mat.subsurface_scattering
self.layout.active = (not mat.shadeless)
@@ -485,7 +497,7 @@
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
sss = mat.subsurface_scattering
wide_ui = context.region.width > narrowui
@@ -523,19 +535,19 @@
COMPAT_ENGINES = {'BLENDER_RENDER'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
def draw_header(self, context):
- raym = context.material.raytrace_mirror
+ raym = active_node_mat(context.material).raytrace_mirror
self.layout.prop(raym, "enabled", text="")
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
raym = mat.raytrace_mirror
wide_ui = context.region.width > narrowui
@@ -582,19 +594,19 @@
COMPAT_ENGINES = {'BLENDER_RENDER'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES)
def draw_header(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
self.layout.prop(mat, "transparency", text="")
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
rayt = mat.raytrace_transparency
wide_ui = context.region.width > narrowui
@@ -649,19 +661,19 @@
COMPAT_ENGINES = {'BLENDER_GAME'}
def poll(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
engine = context.scene.render.engine
return mat and (engine in self.COMPAT_ENGINES)
def draw_header(self, context):
- mat = context.material
+ mat = active_node_mat(context.material)
self.layout.prop(mat, "transparency", text="")
def draw(self, context):
layout = self.layout
- mat = context.material
+ mat = active_node_mat(context.material)
rayt = mat.raytrace_transparency
wide_ui = context.region.width > narrowui
Modified: branches/render25/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d_toolbar.py 2010-03-22 17:25:29 UTC (rev 27666)
+++ branches/render25/release/scripts/ui/space_view3d_toolbar.py 2010-03-22 17:46:49 UTC (rev 27667)
@@ -523,9 +523,11 @@
if settings.tool != 'NONE':
col = layout.column()
col.prop(brush, "size", slider=True)
- col.prop(brush, "strength", slider=True)
+ if settings.tool != 'ADD':
+ col.prop(brush, "strength", slider=True)
if settings.tool == 'ADD':
+ col.prop(brush, "count")
col = layout.column()
col.prop(settings, "add_interpolate")
sub = col.column(align=True)
@@ -568,9 +570,18 @@
col.prop(brush, "use_accumulate")
if brush.sculpt_tool == 'LAYER':
- col.prop(brush, "use_persistent")
- col.operator("sculpt.set_persistent_base")
+ ob = context.sculpt_object
+ do_persistent = True
+ # not supported yet for this case
+ for md in ob.modifiers:
+ if md.type == 'MULTIRES':
+ do_persistent = False
+
+ if do_persistent:
+ col.prop(brush, "use_persistent")
+ col.operator("sculpt.set_persistent_base")
+
# Texture Paint Mode #
elif context.texture_paint_object and brush:
Modified: branches/render25/source/blender/avi/AVI_avi.h
===================================================================
--- branches/render25/source/blender/avi/AVI_avi.h 2010-03-22 17:25:29 UTC (rev 27666)
+++ branches/render25/source/blender/avi/AVI_avi.h 2010-03-22 17:46:49 UTC (rev 27667)
@@ -175,7 +175,7 @@
} AviStreamRec;
typedef struct _AviMovie {
- FILE *fp;
+ FILE *fp;
int type;
#define AVI_MOVIE_READ 0
Modified: branches/render25/source/blender/avi/intern/avi.c
===================================================================
--- branches/render25/source/blender/avi/intern/avi.c 2010-03-22 17:25:29 UTC (rev 27666)
+++ branches/render25/source/blender/avi/intern/avi.c 2010-03-22 17:46:49 UTC (rev 27667)
@@ -197,8 +197,8 @@
return 0;
if (GET_FCC (fp) != FCC("RIFF") ||
- !GET_FCC (fp) ||
- GET_FCC (fp) != FCC("AVI ")) {
+ !GET_FCC (fp) ||
+ GET_FCC (fp) != FCC("AVI ")) {
ret = 0;
} else {
ret = 1;
@@ -228,19 +228,19 @@
return 0;
if (GET_FCC (movie.fp) != FCC("RIFF") ||
- !(movie.size = GET_FCC (movie.fp))) {
- fclose(movie.fp);
+ !(movie.size = GET_FCC (movie.fp))) {
+ fclose(movie.fp);
return 0;
}
movie.header = &header;
if (GET_FCC (movie.fp) != FCC("AVI ") ||
- GET_FCC (movie.fp) != FCC("LIST") ||
- !GET_FCC (movie.fp) ||
- GET_FCC (movie.fp) != FCC("hdrl") ||
- (movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") ||
- !(movie.header->size = GET_FCC (movie.fp))) {
+ GET_FCC (movie.fp) != FCC("LIST") ||
+ !GET_FCC (movie.fp) ||
+ GET_FCC (movie.fp) != FCC("hdrl") ||
+ (movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") ||
+ !(movie.header->size = GET_FCC (movie.fp))) {
DEBUG("bad initial header info\n");
fclose(movie.fp);
return 0;
@@ -274,10 +274,10 @@
for (temp=0; temp < movie.header->Streams; temp++) {
if (GET_FCC(movie.fp) != FCC("LIST") ||
- !GET_FCC (movie.fp) ||
- GET_FCC (movie.fp) != FCC ("strl") ||
- (movie.streams[temp].sh.fcc = GET_FCC (movie.fp)) != FCC ("strh") ||
- !(movie.streams[temp].sh.size = GET_FCC (movie.fp))) {
+ !GET_FCC (movie.fp) ||
+ GET_FCC (movie.fp) != FCC ("strl") ||
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list