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
  #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
@@@ -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);
  
@@@ -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;
  #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