[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42057] branches/bmesh/blender: svn merge ^/trunk/blender -r42009:42053

Campbell Barton ideasman42 at gmail.com
Tue Nov 22 12:51:42 CET 2011


Revision: 42057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42057
Author:   campbellbarton
Date:     2011-11-22 11:51:42 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42009:42053

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

Modified Paths:
--------------
    branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
    branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
    branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h
    branches/bmesh/blender/intern/cycles/util/util_math.h
    branches/bmesh/blender/release/datafiles/fonts/droidsans.ttf.gz
    branches/bmesh/blender/release/scripts/modules/addon_utils.py
    branches/bmesh/blender/release/scripts/presets/tracking_camera/Sony_A55.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_writeavi.h
    branches/bmesh/blender/source/blender/blenkernel/intern/bmfont.c
    branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/image.c
    branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
    branches/bmesh/blender/source/blender/blenkernel/intern/node.c
    branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
    branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
    branches/bmesh/blender/source/blender/blenkernel/intern/writeavi.c
    branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
    branches/bmesh/blender/source/blender/blenlib/BLI_string_utf8.h
    branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
    branches/bmesh/blender/source/blender/blenlib/intern/string_utf8.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
    branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
    branches/bmesh/blender/source/blender/editors/object/object_bake.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c
    branches/bmesh/blender/source/blender/editors/render/render_internal.c
    branches/bmesh/blender/source/blender/editors/render/render_opengl.c
    branches/bmesh/blender/source/blender/editors/render/render_shading.c
    branches/bmesh/blender/source/blender/editors/screen/screendump.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
    branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_buttons.c
    branches/bmesh/blender/source/blender/editors/space_file/file_panels.c
    branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
    branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
    branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/gpu/CMakeLists.txt
    branches/bmesh/blender/source/blender/gpu/GPU_material.h
    branches/bmesh/blender/source/blender/gpu/SConscript
    branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
    branches/bmesh/blender/source/blender/imbuf/intern/IMB_anim.h
    branches/bmesh/blender/source/blender/imbuf/intern/IMB_filter.h
    branches/bmesh/blender/source/blender/imbuf/intern/allocimbuf.c
    branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
    branches/bmesh/blender/source/blender/imbuf/intern/filter.c
    branches/bmesh/blender/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/bmesh/blender/source/blender/imbuf/intern/iris.c
    branches/bmesh/blender/source/blender/imbuf/intern/jp2.c
    branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
    branches/bmesh/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/bmesh/blender/source/blender/imbuf/intern/png.c
    branches/bmesh/blender/source/blender/imbuf/intern/scaling.c
    branches/bmesh/blender/source/blender/imbuf/intern/targa.c
    branches/bmesh/blender/source/blender/imbuf/intern/thumbs.c
    branches/bmesh/blender/source/blender/imbuf/intern/tiff.c
    branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
    branches/bmesh/blender/source/blender/makesrna/RNA_enum_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_brush.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_image_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_property.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_texture_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
    branches/bmesh/blender/source/blender/nodes/NOD_composite.h
    branches/bmesh/blender/source/blender/nodes/NOD_shader.h
    branches/bmesh/blender/source/blender/nodes/NOD_texture.h
    branches/bmesh/blender/source/blender/nodes/composite/node_composite_tree.c
    branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.c
    branches/bmesh/blender/source/blender/nodes/composite/node_composite_util.h
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/bmesh/blender/source/blender/nodes/intern/node_common.c
    branches/bmesh/blender/source/blender/nodes/intern/node_exec.c
    branches/bmesh/blender/source/blender/nodes/intern/node_util.c
    branches/bmesh/blender/source/blender/nodes/intern/node_util.h
    branches/bmesh/blender/source/blender/nodes/shader/node_shader_tree.c
    branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.c
    branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.h
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_background.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_emission.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_fresnel.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_holdout.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_light_path.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output_material.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output_world.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
    branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
    branches/bmesh/blender/source/blender/nodes/texture/node_texture_tree.c
    branches/bmesh/blender/source/blender/nodes/texture/node_texture_util.c
    branches/bmesh/blender/source/blender/nodes/texture/node_texture_util.h
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_at.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_rotate.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_scale.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_translate.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_valToNor.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/bmesh/blender/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/bmesh/blender/source/blender/quicktime/apple/qtkit_export.m
    branches/bmesh/blender/source/blender/quicktime/apple/quicktime_export.c
    branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
    branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/common/bmfont.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-42009
   + /trunk/blender:39992-42053

Modified: branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/__init__.py	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/intern/cycles/blender/addon/__init__.py	2011-11-22 11:51:42 UTC (rev 42057)
@@ -43,7 +43,7 @@
 
 class CyclesRender(bpy.types.RenderEngine):
     bl_idname = 'CYCLES'
-    bl_label = "Cycles"
+    bl_label = "Cycles Render"
     bl_use_shading_nodes = True
 
     def __init__(self):

Modified: branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp	2011-11-22 11:51:42 UTC (rev 42057)
@@ -99,6 +99,9 @@
 
 static void get_tex_mapping(TextureMapping *mapping, BL::TexMapping b_mapping)
 {
+	if(!b_mapping)
+		return;
+
 	mapping->translation = get_float3(b_mapping.location());
 	mapping->rotation = get_float3(b_mapping.rotation());
 	mapping->scale = get_float3(b_mapping.scale());
@@ -110,6 +113,9 @@
 
 static void get_tex_mapping(TextureMapping *mapping, BL::ShaderNodeMapping b_mapping)
 {
+	if(!b_mapping)
+		return;
+
 	mapping->translation = get_float3(b_mapping.location());
 	mapping->rotation = get_float3(b_mapping.rotation());
 	mapping->scale = get_float3(b_mapping.scale());

Modified: branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h	2011-11-22 11:51:42 UTC (rev 42057)
@@ -97,11 +97,7 @@
 	float c1loz = nz.z * idir.z - ood.z;
 	float c1hiz = nz.w * idir.z - ood.z;
 
-	float c0min_x = min(c0lox, c0hix);
-	float c0min_y = min(c0loy, c0hiy);
-	float c0min_z = min(c0loz, c0hiz);
-
-	float c0min = max4(c0min_x, c0min_y, c0min_z, 0.0f);
+	float c0min = max4(min(c0lox, c0hix), min(c0loy, c0hiy), min(c0loz, c0hiz), 0.0f);
 	float c0max = min4(max(c0lox, c0hix), max(c0loy, c0hiy), max(c0loz, c0hiz), t);
 	float c1lox = n1xy.x * idir.x - ood.x;
 	float c1hix = n1xy.y * idir.x - ood.x;

Modified: branches/bmesh/blender/intern/cycles/util/util_math.h
===================================================================
--- branches/bmesh/blender/intern/cycles/util/util_math.h	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/intern/cycles/util/util_math.h	2011-11-22 11:51:42 UTC (rev 42057)
@@ -115,12 +115,12 @@
 
 __device_inline float min4(float a, float b, float c, float d)
 {
-	return min(min(min(a, b), c), d);
+	return min(min(a, b), min(c, d));
 }
 
 __device_inline float max4(float a, float b, float c, float d)
 {
-	return max(max(max(a, b), c), d);
+	return max(max(a, b), max(c, d));
 }
 
 #ifndef __KERNEL_OPENCL__


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42009
   + /trunk/blender/release:31524-42053

Modified: branches/bmesh/blender/release/datafiles/fonts/droidsans.ttf.gz
===================================================================
(Binary files differ)

Modified: branches/bmesh/blender/release/scripts/modules/addon_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/addon_utils.py	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/release/scripts/modules/addon_utils.py	2011-11-22 11:51:42 UTC (rev 42057)
@@ -146,7 +146,10 @@
     for path in path_list:
 
         # force all contrib addons to be 'TESTING'
-        force_support = 'TESTING' if path.endswith("addons_contrib") else None
+        if path.endswith("addons_contrib") or path.endswith("addons_extern"):
+            force_support = 'TESTING'
+        else:
+            force_support = None
 
         for mod_name, mod_path in _bpy.path.module_names(path):
             modules_stale -= {mod_name}

Modified: branches/bmesh/blender/release/scripts/presets/tracking_camera/Sony_A55.py
===================================================================
--- branches/bmesh/blender/release/scripts/presets/tracking_camera/Sony_A55.py	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/release/scripts/presets/tracking_camera/Sony_A55.py	2011-11-22 11:51:42 UTC (rev 42057)
@@ -2,7 +2,6 @@
 camera = bpy.context.edit_movieclip.tracking.camera
 
 camera.sensor_width = 23.4
-camera.sensor_height = 15.6
 camera.units = 'MILLIMETERS'
 camera.focal_length = 24.0
 camera.pixel_aspect = 1

Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2011-11-22 11:51:42 UTC (rev 42057)
@@ -77,11 +77,11 @@
         return {'FINISHED'}
 
 
-class CLIP_OT_tracks_to_mesh(Operator):
-    """Create vertex cloud using coordinates of tracks"""
+class CLIP_OT_bundles_to_mesh(Operator):
+    """Create vertex cloud using coordinates of reconstructed tracks"""
 
-    bl_idname = "clip.tracks_to_mesh"
-    bl_label = "Tracks to Mesh"
+    bl_idname = "clip.bundles_to_mesh"
+    bl_label = "3D Markers to Mesh"
     bl_options = {'UNDO', 'REGISTER'}
 
     @classmethod

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_render.py	2011-11-22 11:51:42 UTC (rev 42057)
@@ -452,66 +452,22 @@
         layout = self.layout
 
         rd = context.scene.render
-        file_format = rd.file_format
+        image_settings = rd.image_settings
+        file_format = rd.image_settings.file_format
 
         layout.prop(rd, "filepath", text="")
 
         split = layout.split()
 
         col = split.column()
-        col.prop(rd, "file_format", text="")
-        col.row().prop(rd, "color_mode", text="Color", expand=True)
+        col.template_image_settings(rd.image_settings)
 
         col = split.column()
         col.prop(rd, "use_file_extension")
         col.prop(rd, "use_overwrite")
         col.prop(rd, "use_placeholder")
 
-        if file_format in {'AVI_JPEG', 'JPEG'}:
-            layout.prop(rd, "file_quality", slider=True)
-
-        if file_format == 'PNG':
-            layout.prop(rd, "file_quality", slider=True, text="Compression")
-
-        if file_format in {'OPEN_EXR', 'MULTILAYER'}:
-            row = layout.row()
-            row.prop(rd, "exr_codec", text="Codec")
-
-            if file_format == 'OPEN_EXR':
-                row = layout.row()
-                row.prop(rd, "use_exr_half")
-                row.prop(rd, "exr_zbuf")
-                row.prop(rd, "exr_preview")
-
-        elif file_format == 'JPEG2000':
-            split = layout.split()
-            col = split.column()
-            col.label(text="Depth:")
-            col.row().prop(rd, "jpeg2k_depth", expand=True)
-
-            col = split.column()
-            col.prop(rd, "jpeg2k_preset", text="")
-            col.prop(rd, "jpeg2k_ycc")
-
-        elif file_format in {'CINEON', 'DPX'}:
-
-            split = layout.split()
-            split.label("FIXME: hard coded Non-Linear, Gamma:1.0")
-            '''
-            col = split.column()
-            col.prop(rd, "use_cineon_log", text="Convert to Log")
-
-            col = split.column(align=True)
-            col.active = rd.use_cineon_log
-            col.prop(rd, "cineon_black", text="Black")
-            col.prop(rd, "cineon_white", text="White")
-            col.prop(rd, "cineon_gamma", text="Gamma")
-            '''
-
-        elif file_format == 'TIFF':
-            layout.prop(rd, "use_tiff_16bit")
-
-        elif file_format == 'QUICKTIME_CARBON':
+        if file_format == 'QUICKTIME_CARBON':
             layout.operator("scene.render_data_set_quicktime_codec")
 
         elif file_format == 'QUICKTIME_QTKIT':
@@ -552,7 +508,7 @@
     @classmethod
     def poll(cls, context):
         rd = context.scene.render
-        return rd.file_format in {'FFMPEG', 'XVID', 'H264', 'THEORA'}
+        return rd.image_settings.file_format in {'FFMPEG', 'XVID', 'H264', 'THEORA'}
 
     def draw(self, context):
         layout = self.layout

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2011-11-22 11:51:12 UTC (rev 42056)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2011-11-22 11:51:42 UTC (rev 42057)
@@ -210,7 +210,7 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("clip.tracks_to_mesh")
+        layout.operator("clip.bundles_to_mesh")
         layout.operator("clip.track_to_empty")
 
 
@@ -402,15 +402,15 @@
         col.prop(sc, "show_marker_search", text="Search")
         col.prop(sc, "show_pyramid_levels", text="Pyramid")
 
-        col.prop(sc, "show_track_path", text="Track Path")
+        col.prop(sc, "show_track_path", text="Path")
         row = col.row()
         row.active = sc.show_track_path
         row.prop(sc, "path_length", text="Length")
 
         col.prop(sc, "show_disabled", "Disabled Tracks")
-        col.prop(sc, "show_bundles", text="Bundles")
+        col.prop(sc, "show_bundles", text="3D Markers")
 
-        col.prop(sc, "show_names", text="Track Names and Status")
+        col.prop(sc, "show_names", text="Names and Status")
         col.prop(sc, "show_tiny_markers", text="Compact Markers")
 
         col.prop(sc, "show_grease_pencil", text="Grease Pencil")

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list