[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43274] branches/soc-2011-onion-uv-tools/ source/blender/editors/sculpt_paint: Fix error left from first attempts at colour correction: don' t colour corect byte texture paint operations.

[Antony Riakiotakis]

Revision: 43274
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43274
Author:   psy-fi
Date:     2012-01-11 01:09:00 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Fix error left from first attempts at colour correction: don't colour corect byte texture paint operations.
Also remove unneeded exec function for uv_sculpt operator.

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_uv.c

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c	2012-01-11 00:34:42 UTC (rev 43273)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c	2012-01-11 01:09:00 UTC (rev 43274)
@@ -3771,16 +3771,13 @@
 	unsigned char rgba_ub[4];
 	
 	if (ps->is_texbrush) {
-		/*rgba already holds a texture result here from higher level function*/
 		rgba_ub[0] = FTOCHAR(rgba[0] * ps->brush->rgb[0]);
 		rgba_ub[1] = FTOCHAR(rgba[1] * ps->brush->rgb[1]);
 		rgba_ub[2] = FTOCHAR(rgba[2] * ps->brush->rgb[2]);
 		rgba_ub[3] = FTOCHAR(rgba[3]);
 	}
 	else {
-		VECCOPY(rgba, ps->brush->rgb);
-		srgb_to_linearrgb_v3_v3(rgba, rgba);
-		IMAPAINT_FLOAT_RGB_TO_CHAR(rgba_ub, rgba);
+		IMAPAINT_FLOAT_RGB_TO_CHAR(rgba_ub, ps->brush->rgb);
 		rgba_ub[3] = 255;
 	}
 	

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_uv.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_uv.c	2012-01-11 00:34:42 UTC (rev 43273)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_uv.c	2012-01-11 01:09:00 UTC (rev 43274)
@@ -598,24 +598,8 @@
 
 	return OPERATOR_RUNNING_MODAL;
 }
-/*
- * After discussion with brecht looks like it may not be needed
-static int uv_sculpt_stroke_exec(bContext *C, wmOperator *op)
-{
 
-	Object *obedit = CTX_data_edit_object(C);
 
-	if(!uv_paint_stroke_init(C, op)) {
-		uv_paint_stroke_exit(C, op);
-		return OPERATOR_CANCELLED;
-	}
-	uv_smooth_stroke_apply(C, op, event, obedit);
-
-	uv_sculpt_stroke_exit(C, op);
-	return OPERATOR_FINISHED;
-}
-*/
-
 static int uv_sculpt_stroke_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
 	UvSculptData *data = (UvSculptData *)op->customdata;
@@ -654,7 +638,6 @@
 
 	/* api callbacks */
 	ot->invoke = uv_sculpt_stroke_invoke;
-//	ot->exec = uv_sculpt_stroke_exec;
 	ot->modal = uv_sculpt_stroke_modal;
 	ot->poll = uv_sculpt_poll;