[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38902] branches/soc-2011-onion/source/ blender/editors: A few centimetres of progress in smooth brush, plus fix compile for scons

[Antony Riakiotakis]

Revision: 38902
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38902
Author:   psy-fi
Date:     2011-08-01 18:47:31 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
A few centimetres of progress in smooth brush, plus fix compile for scons

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-onion/source/blender/editors/space_image/image_ops.c

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript	2011-08-01 16:34:28 UTC (rev 38901)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/SConscript	2011-08-01 18:47:31 UTC (rev 38902)
@@ -29,6 +29,7 @@
 incs += ' ../../render/extern/include'
 incs += ' ../../gpu ../../makesrna ../../blenloader'
 incs += ' #/extern/brushlib'
+incs += ' ' + env['BF_PYTHON_INC']
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'

Modified: branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c	2011-08-01 16:34:28 UTC (rev 38901)
+++ branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_ops.c	2011-08-01 18:47:31 UTC (rev 38902)
@@ -377,7 +377,7 @@
 	ot->poll= uv_smooth_poll;
 
 	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag= OPTYPE_REGISTER;//|OPTYPE_UNDO;
 
 	/* props */
 }

Modified: branches/soc-2011-onion/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/space_image/image_ops.c	2011-08-01 16:34:28 UTC (rev 38901)
+++ branches/soc-2011-onion/source/blender/editors/space_image/image_ops.c	2011-08-01 18:47:31 UTC (rev 38902)
@@ -171,6 +171,16 @@
 	return 0;
 }
 
+static int space_image_image_sample_poll(bContext *C)
+{
+	SpaceImage *sima= CTX_wm_space_image(C);
+	Object *obedit= CTX_data_edit_object(C);
+	if(obedit){
+		if(ED_space_image_show_uvedit(sima, obedit) && (sima->flag & SI_SMOOTH_BRUSH))
+			return 0;
+	}
+	return space_image_main_area_poll(C);
+}
 /********************** view pan operator *********************/
 
 typedef struct ViewPanData {
@@ -1820,7 +1830,7 @@
 	ot->invoke= sample_invoke;
 	ot->modal= sample_modal;
 	ot->cancel= sample_cancel;
-	ot->poll= space_image_main_area_poll;
+	ot->poll= space_image_image_sample_poll;
 
 	/* flags */
 	ot->flag= OPTYPE_BLOCKING;