svn merge ^/trunk/blender -r42991:43009
authorCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 03:07:14 +0000 (03:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 31 Dec 2011 03:07:14 +0000 (03:07 +0000)
14 files changed:
1  2 
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c

index 860afdb2b50dfd1bf784dbe7dfb9d85efb821434,76185d7c5cf92856b5ea9d698e2f004f453c8ce0..e827e16f6436e5542e8aee10f499142a68b3e5c5
@@@ -1966,10 -1884,12 +1965,12 @@@ static int wpaint_stroke_test_start(bCo
  
        float mat[4][4], imat[4][4];
        
-       if(scene->obedit) return OPERATOR_CANCELLED;
+       if(scene->obedit) {
+               return FALSE;
+       }
        
        me= get_mesh(ob);
 -      if(me==NULL || me->totface==0) return OPERATOR_PASS_THROUGH;
 +      if(me==NULL || me->totpoly==0) return OPERATOR_PASS_THROUGH;
        
        /* if nothing was added yet, we make dverts and a vertex deform group */
        if (!me->dvert) {
index cf61fe9281428cc9e019023cb70fbb21e919ed1a,a2173537c8c5a55e6604c211f128b82f45077617..1f1a17ce5cd74e33969e638d5561c3828bc95b4e
@@@ -55,8 -55,7 +55,9 @@@
  #include "BKE_lattice.h"
  #include "BKE_main.h"
  #include "BKE_object.h"
 +#include "BKE_tessmesh.h"
 +#include "BKE_DerivedMesh.h"
+ #include "BKE_scene.h"
  #include "BKE_tracking.h"
  
  #include "WM_api.h"
Simple merge