[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53592] trunk/blender/source/blender/ editors: Trackpad pans for UV/ Image and MovieClip editors were inverse compared to all other editors.
Ton Roosendaal
ton at blender.org
Sat Jan 5 18:57:17 CET 2013
Revision: 53592
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53592
Author: ton
Date: 2013-01-05 17:57:17 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Trackpad pans for UV/Image and MovieClip editors were inverse compared to all other editors.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_image/image_ops.c
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2013-01-05 17:13:07 UTC (rev 53591)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2013-01-05 17:57:17 UTC (rev 53592)
@@ -84,6 +84,8 @@
#include "IMB_imbuf_types.h"
#include "IMB_colormanagement.h"
+#include "GPU_extensions.h"
+
#include "BIF_gl.h"
#include "BIF_glutil.h"
@@ -885,6 +887,8 @@
ID *id = sp->id;
short idtype = GS(id->name);
+ printf("icon start job %s\n", id->name);
+
if (idtype == ID_IM) {
Image *ima = (Image *)id;
ImBuf *ibuf = NULL;
@@ -1007,8 +1011,27 @@
{
IconPreview *ip = customdata;
- if (ip->id && GS(ip->id->name) == ID_BR)
- WM_main_add_notifier(NC_BRUSH | NA_EDITED, ip->id);
+ if (ip->id) {
+ printf("icon end job %s\n", ip->id->name);
+
+ if (GS(ip->id->name) == ID_BR)
+ WM_main_add_notifier(NC_BRUSH | NA_EDITED, ip->id);
+
+ if (GS(ip->id->name) == ID_MA) {
+ Material *ma = (Material *)ip->id;
+ PreviewImage *prv_img = ma->preview;
+ int i;
+
+ /* signal to gpu texture */
+ for (i = 0; i < NUM_ICON_SIZES; ++i) {
+ if (prv_img->gputexture[i]) {
+ GPU_texture_free(prv_img->gputexture[i]);
+ prv_img->gputexture[i] = NULL;
+ WM_main_add_notifier(NC_MATERIAL|ND_SHADING_DRAW, ip->id);
+ }
+ }
+ }
+ }
}
static void icon_preview_free(void *customdata)
@@ -1044,7 +1067,7 @@
/* setup job */
WM_jobs_customdata_set(wm_job, ip, icon_preview_free);
- WM_jobs_timer(wm_job, 0.25, NC_MATERIAL, NC_MATERIAL);
+ WM_jobs_timer(wm_job, 0.1, NC_MATERIAL, NC_MATERIAL);
WM_jobs_callbacks(wm_job, icon_preview_startjob_all_sizes, NULL, NULL, icon_preview_endjob);
WM_jobs_start(CTX_wm_manager(C), wm_job);
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2013-01-05 17:13:07 UTC (rev 53591)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c 2013-01-05 17:57:17 UTC (rev 53592)
@@ -382,8 +382,8 @@
SpaceClip *sc = CTX_wm_space_clip(C);
float offset[2];
- offset[0] = (event->x - event->prevx) / sc->zoom;
- offset[1] = (event->y - event->prevy) / sc->zoom;
+ offset[0] = (event->prevx - event->x) / sc->zoom;
+ offset[1] = (event->prevy - event->y) / sc->zoom;
RNA_float_set_array(op->ptr, "offset", offset);
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c 2013-01-05 17:13:07 UTC (rev 53591)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c 2013-01-05 17:57:17 UTC (rev 53592)
@@ -299,8 +299,8 @@
SpaceImage *sima = CTX_wm_space_image(C);
float offset[2];
- offset[0] = (event->x - event->prevx) / sima->zoom;
- offset[1] = (event->y - event->prevy) / sima->zoom;
+ offset[0] = (event->prevx - event->x) / sima->zoom;
+ offset[1] = (event->prevy - event->y) / sima->zoom;
RNA_float_set_array(op->ptr, "offset", offset);
image_view_pan_exec(C, op);
More information about the Bf-blender-cvs
mailing list