Revision: 30019 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30019 Author: jwilkins Date: 2010-07-06 10:21:21 +0200 (Tue, 06 Jul 2010)
Log Message: ----------- * more in-between mouse event code from the trunk Modified Paths: -------------- branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c Modified: branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c =================================================================== --- branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c 2010-07-06 08:09:11 UTC (rev 30018) +++ branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c 2010-07-06 08:21:21 UTC (rev 30019) @@ -27,7 +27,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/* global includes */ +/* global includes */ #include <stdlib.h> #include <math.h> @@ -380,7 +380,7 @@ } } else if(id_type==ID_TE) { - Tex *tex= (Tex*)id; + Tex *tex= (Tex *)id; sce->lay= 1<<MA_TEXTURE; @@ -452,7 +452,7 @@ int gamma_correct=0; int offx=0, newx= rect->xmax-rect->xmin, newy= rect->ymax-rect->ymin; - if (id && (GS(id->name) != ID_TE)) { + if (id && GS(id->name) != ID_TE) { /* exception: don't color manage texture previews - show the raw values */ if (sce) gamma_correct = sce->r.color_mgt_flag & R_COLOR_MANAGEMENT; } @@ -1057,7 +1057,7 @@ memset(&iuser, 0, sizeof(ImageUser)); iuser.ok= iuser.framenr= 1; iuser.scene= sp->scene; - + /* elubie: this needs to be changed: here image is always loaded if not already there. Very expensive for large images. Need to find a way to only get existing ibuf */ Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c =================================================================== --- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c 2010-07-06 08:09:11 UTC (rev 30018) +++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c 2010-07-06 08:21:21 UTC (rev 30019) @@ -4874,6 +4874,7 @@ paint_exit(C, op); return OPERATOR_FINISHED; case MOUSEMOVE: + case INBETWEEN_MOUSEMOVE: paint_apply_event(C, op, event); break; case TIMER: _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs