Merged changes in the trunk up to revision 50257.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 29 Aug 2012 00:53:29 +0000 (00:53 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 29 Aug 2012 00:53:29 +0000 (00:53 +0000)
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt

31 files changed:
1  2 
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

Simple merge
index cb2f89bd2e3d8fbfbfa96c893f83e1241ea9992c,afa3998fb49397baa6a28308a60e53152663fdea..d6422e899979aca621c067873d9bb0ff0f5705c0
@@@ -102,8 -101,8 +102,8 @@@ set(SR
        intern/lamp.c
        intern/lattice.c
        intern/library.c
 -      intern/mask_evaluate.c
 -      intern/mask_rasterize.c
 +      intern/linestyle.c
-       intern/mask_rasterize.c
++      intern/mask_evaluate.c  intern/mask_rasterize.c
        intern/mask.c
        intern/material.c
        intern/mball.c
Simple merge
index e91953a890bc2b6be47cfd6e2dfafdf16e1bce1f,9a524831388bfbcdaf2191c3aa4a789bb33a884a..14c9df2da4e2d9c841075023da767cfcd8b70737
@@@ -715,8 -713,8 +716,8 @@@ static RenderPart *find_next_pano_slice
                float phi = panorama_pixel_rot(re);
  
                R.panodxp = (re->winx - (best->disprect.xmin + best->disprect.xmax) ) / 2;
-               R.panodxv = ((viewplane->xmax - viewplane->xmin) * R.panodxp) / (float)(re->winx);
+               R.panodxv = (BLI_RCT_SIZE_X(viewplane) * R.panodxp) / (float)(re->winx);
 -
 +              
                /* shift viewplane */
                R.viewplane.xmin = viewplane->xmin + R.panodxv;
                R.viewplane.xmax = viewplane->xmax + R.panodxv;
Simple merge