svn merge -r41458:41480 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Nov 2011 23:16:10 +0000 (23:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Nov 2011 23:16:10 +0000 (23:16 +0000)
17 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c

diff --cc CMakeLists.txt
Simple merge
index 29bb25915b97c8af8fa54779d532e9630cca8fb9,a5edd569bc2345045307b80daee3f7775ab3a9e1..bd004ce21f2263308da88b5ab59ea02c288278fa
  #include "BKE_lattice.h"
  #include "BKE_library.h"
  #include "BKE_mesh.h"
 +#include "BKE_tessmesh.h"
  #include "BKE_mball.h"
  #include "BKE_modifier.h"
+ #include "BKE_node.h"
  #include "BKE_object.h"
  #include "BKE_paint.h"
  #include "BKE_particle.h"
Simple merge
index 9b3d12b159d8e551521c9a08d2d2b6dbadaac9ff,c26a4d52a9ecd8632364de65559cb0f9aae81d78..c682e42c35b608907ad2d55e614be332811a3ab0
@@@ -1383,10 -1380,11 +1399,11 @@@ static void do_nudge_brush(Sculpt *sd, 
                proxy= BLI_pbvh_node_add_proxy(ss->pbvh, nodes[n])->co;
  
                sculpt_brush_test_init(ss, &test);
 -
 +              
                BLI_pbvh_vertex_iter_begin(ss->pbvh, nodes[n], vd, PBVH_ITER_UNIQUE) {
                        if(sculpt_brush_test(&test, vd.co)) {
-                               const float fade = bstrength*tex_strength(ss, brush, vd.co, test.dist)*frontface(brush, an, vd.no, vd.fno);
+                               const float fade = bstrength*tex_strength(ss, brush, vd.co, test.dist,
+                                                                         an, vd.no, vd.fno);
  
                                mul_v3_v3fl(proxy[vd.i], cono, fade);
  
index a4dc1a8b012ff6d7f9ec5066d1626c1017f58e77,593537f82d06632512194a344b0eb76a4cbd102c..cd8739559a1576046dab52aad6840d9c76300e55
@@@ -2776,11 -2693,10 +2776,10 @@@ static void draw_mesh_fancy(Scene *scen
        
        /* totvert = dm->getNumVerts(dm); */ /*UNUSED*/
        totedge = dm->getNumEdges(dm);
 -      totface = dm->getNumFaces(dm);
 +      totface = dm->getNumTessFaces(dm);
        
        /* vertexpaint, faceselect wants this, but it doesnt work for shaded? */
-       if(dt!=OB_SHADED)
-               glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+       glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
  
                // Unwanted combination.
        if (is_paint_sel) draw_wire = 0;
index 968e7264cf72dbebd1520bdad1fbd552dca5e492,63fce2d9edb7630f53f07c76433d627946f5d071..9abc7a7c1923c26e1aba7f7a879fb0caa2d1149a
  #include "DNA_userdef_types.h"
  #include "BLI_math.h"
  
 +#include "BKE_tessmesh.h"
 +
  /* Include for Bake Options */
+ #include "RE_engine.h"
  #include "RE_pipeline.h"
  
  #ifdef WITH_QUICKTIME