[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49443] trunk/blender: misc mask fixes
Campbell Barton
ideasman42 at gmail.com
Wed Aug 1 12:50:40 CEST 2012
Revision: 49443
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49443
Author: campbellbarton
Date: 2012-08-01 10:50:39 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
misc mask fixes
- image space used wrong notifiers.
- image notifier now checks for mask mode before listening to mask edits.
- mask keyframes now draw in the image space.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/source/blender/editors/include/ED_mask.h
trunk/blender/source/blender/editors/mask/mask_draw.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_intern.h
trunk/blender/source/blender/editors/space_clip/clip_utils.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/makesrna/intern/rna_mask.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_image.py 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/release/scripts/startup/bl_ui/space_image.py 2012-08-01 10:50:39 UTC (rev 49443)
@@ -356,6 +356,7 @@
show_render = sima.show_render
# show_paint = sima.show_paint
show_uvedit = sima.show_uvedit
+ show_maskedit = sima.show_maskedit
row = layout.row(align=True)
row.template_header()
@@ -407,7 +408,7 @@
mesh = context.edit_object.data
layout.prop_search(mesh.uv_textures, "active", mesh, "uv_textures", text="")
- elif mode == 'MASK':
+ if show_maskedit:
row = layout.row()
row.template_ID(sima, "mask", new="mask.new")
Modified: trunk/blender/source/blender/editors/include/ED_mask.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mask.h 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/editors/include/ED_mask.h 2012-08-01 10:50:39 UTC (rev 49443)
@@ -61,6 +61,8 @@
float stabmat[4][4],
const bContext *C);
+void ED_mask_draw_frames(struct Mask *mask, struct ARegion *ar, const int cfra, const int sfra, const int efra);
+
/* mask_shapekey.c */
void ED_mask_layer_shape_auto_key(struct MaskLayer *masklay, const int frame);
int ED_mask_layer_shape_auto_key_all(struct Mask *mask, const int frame);
Modified: trunk/blender/source/blender/editors/mask/mask_draw.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_draw.c 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/editors/mask/mask_draw.c 2012-08-01 10:50:39 UTC (rev 49443)
@@ -482,7 +482,7 @@
struct View2D *v2d = &ar->v2d;
int x, y;
- int w, h;
+ /* int w, h; */
float zoomx, zoomy;
/* frame image */
@@ -492,9 +492,11 @@
/* find window pixel coordinates of origin */
UI_view2d_to_region_no_clip(&ar->v2d, 0.0f, 0.0f, &x, &y);
- w = v2d->tot.xmax - v2d->tot.xmin;
- h = v2d->tot.ymax - v2d->tot.ymin;
+ /* w = v2d->tot.xmax - v2d->tot.xmin; */
+ /* h = v2d->tot.ymax - v2d->tot.ymin;/*/
+
+
zoomx = (float)(ar->winrct.xmax - ar->winrct.xmin + 1) / (float)((ar->v2d.cur.xmax - ar->v2d.cur.xmin));
zoomy = (float)(ar->winrct.ymax - ar->winrct.ymin + 1) / (float)((ar->v2d.cur.ymax - ar->v2d.cur.ymin));
@@ -538,3 +540,32 @@
glPopMatrix();
}
+
+void ED_mask_draw_frames(Mask *mask, ARegion *ar, const int cfra, const int sfra, const int efra)
+{
+ const float framelen = ar->winx / (float)(efra - sfra + 1);
+
+ MaskLayer *masklay = BKE_mask_layer_active(mask);
+
+ glBegin(GL_LINES);
+ glColor4ub(255, 175, 0, 255);
+
+ if (masklay) {
+ MaskLayerShape *masklay_shape;
+
+ for (masklay_shape = masklay->splines_shapes.first;
+ masklay_shape;
+ masklay_shape = masklay_shape->next)
+ {
+ int frame = masklay_shape->frame;
+
+ /* draw_keyframe(i, CFRA, sfra, framelen, 1); */
+ int height = (frame == cfra) ? 22 : 10;
+ int x = (frame - sfra) * framelen;
+ glVertex2i(x, 0);
+ glVertex2i(x, height);
+ }
+ }
+
+ glEnd();
+}
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-08-01 10:50:39 UTC (rev 49443)
@@ -53,6 +53,7 @@
#include "ED_screen.h"
#include "ED_clip.h"
+#include "ED_mask.h"
#include "ED_gpencil.h"
#include "BIF_gl.h"
@@ -73,7 +74,7 @@
/*********************** main area drawing *************************/
-void clip_draw_curfra_label(SpaceClip *sc, float x, float y)
+void clip_draw_curfra_label(const int framenr, const float x, const float y)
{
uiStyle *style = UI_GetStyle();
int fontid = style->widget.uifont_id;
@@ -82,7 +83,7 @@
/* frame number */
BLF_size(fontid, 11.0f, U.dpi);
- BLI_snprintf(numstr, sizeof(numstr), "%d", sc->user.framenr);
+ BLI_snprintf(numstr, sizeof(numstr), "%d", framenr);
BLF_width_and_height(fontid, numstr, &font_dims[0], &font_dims[1]);
@@ -212,7 +213,7 @@
UI_ThemeColor(TH_CFRAME);
glRecti(x, 0, x + framelen, 8);
- clip_draw_curfra_label(sc, x, 8.0f);
+ clip_draw_curfra_label(sc->user.framenr, x, 8.0f);
/* solver keyframes */
glColor4ub(175, 255, 0, 255);
@@ -221,24 +222,7 @@
/* movie clip animation */
if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask_info.mask) {
- MaskLayer *masklay = BKE_mask_layer_active(sc->mask_info.mask);
- if (masklay) {
- MaskLayerShape *masklay_shape;
-
- glColor4ub(255, 175, 0, 255);
- glBegin(GL_LINES);
-
- for (masklay_shape = masklay->splines_shapes.first;
- masklay_shape;
- masklay_shape = masklay_shape->next)
- {
- i = masklay_shape->frame;
-
- draw_keyframe(i, CFRA, sfra, framelen, 1);
- }
-
- glEnd();
- }
+ ED_mask_draw_frames(sc->mask_info.mask, ar, CFRA, sfra, efra);
}
}
Modified: trunk/blender/source/blender/editors/space_clip/clip_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_intern.h 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/editors/space_clip/clip_intern.h 2012-08-01 10:50:39 UTC (rev 49443)
@@ -71,7 +71,7 @@
/* clip_draw.c */
void clip_draw_main(const struct bContext *C, struct SpaceClip *sc, struct ARegion *ar);
void clip_draw_grease_pencil(struct bContext *C, int onlyv2d);
-void clip_draw_curfra_label(struct SpaceClip *sc, float x, float y);
+void clip_draw_curfra_label(const int framenr, const float x, const float y);
/* clip_graph_draw.c */
void clip_draw_graph(struct SpaceClip *sc, struct ARegion *ar, struct Scene *scene);
Modified: trunk/blender/source/blender/editors/space_clip/clip_utils.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_utils.c 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/editors/space_clip/clip_utils.c 2012-08-01 10:50:39 UTC (rev 49443)
@@ -263,7 +263,7 @@
UI_view2d_getscale(v2d, &xscale, &yscale);
glScalef(1.0f / xscale, 1.0f, 1.0f);
- clip_draw_curfra_label(sc, (float)sc->user.framenr * xscale, 18);
+ clip_draw_curfra_label(sc->user.framenr, (float)sc->user.framenr * xscale, 18);
/* restore view transform */
glScalef(xscale, 1.0, 1.0);
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/editors/space_image/space_image.c 2012-08-01 10:50:39 UTC (rev 49443)
@@ -430,22 +430,28 @@
}
break;
case NC_MASK:
- switch (wmn->data) {
- case ND_SELECT:
- case ND_DATA:
- case ND_DRAW:
- ED_area_tag_redraw(sa);
- break;
+ {
+ // Scene *scene = wmn->window->screen->scene;
+ /* ideally would check for: ED_space_image_check_show_maskedit(scene, sima) but we cant get the scene */
+ if (sima->mode == SI_MODE_MASK) {
+ switch (wmn->data) {
+ case ND_SELECT:
+ case ND_DATA:
+ case ND_DRAW:
+ ED_area_tag_redraw(sa);
+ break;
+ }
+ switch (wmn->action) {
+ case NA_SELECTED:
+ ED_area_tag_redraw(sa);
+ break;
+ case NA_EDITED:
+ ED_area_tag_redraw(sa);
+ break;
+ }
}
- switch (wmn->action) {
- case NA_SELECTED:
- ED_area_tag_redraw(sa);
- break;
- case NA_EDITED:
- ED_area_tag_redraw(sa);
- break;
- }
break;
+ }
case NC_GEOM:
switch (wmn->data) {
case ND_DATA:
@@ -643,6 +649,8 @@
TRUE, FALSE,
NULL, C);
+ ED_mask_draw_frames(mask, ar, CFRA, mask->sfra, mask->efra);
+
draw_image_cursor(sima, ar);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_mask.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mask.c 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/makesrna/intern/rna_mask.c 2012-08-01 10:50:39 UTC (rev 49443)
@@ -731,7 +731,7 @@
RNA_def_property_int_funcs(prop, NULL, "rna_Mask_start_frame_set", NULL);
RNA_def_property_range(prop, MINFRAME, MAXFRAME);
RNA_def_property_ui_text(prop, "Start Frame", "First frame of the mask (used for sequencer)");
- RNA_def_property_update(prop, NC_SCENE | ND_FRAME_RANGE, NULL);
+ RNA_def_property_update(prop, NC_MASK | ND_DRAW, NULL);
prop = RNA_def_property(srna, "frame_end", PROP_INT, PROP_TIME);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
@@ -739,7 +739,7 @@
RNA_def_property_int_funcs(prop, NULL, "rna_Mask_end_frame_set", NULL);
RNA_def_property_range(prop, MINFRAME, MAXFRAME);
RNA_def_property_ui_text(prop, "End Frame", "Final frame of the mask (used for sequencer)");
- RNA_def_property_update(prop, NC_SCENE | ND_FRAME_RANGE, NULL);
+ RNA_def_property_update(prop, NC_MASK | ND_DRAW, NULL);
/* pointers */
rna_def_animdata_common(srna);
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2012-08-01 10:44:55 UTC (rev 49442)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2012-08-01 10:50:39 UTC (rev 49443)
@@ -558,6 +558,13 @@
return ED_space_image_show_uvedit(sima, sc->scene->obedit);
}
+static int rna_SpaceImageEditor_show_maskedit_get(PointerRNA *ptr)
+{
+ SpaceImage *sima = (SpaceImage *)(ptr->data);
+ bScreen *sc = (bScreen *)ptr->id.data;
+ return ED_space_image_check_show_maskedit(sc->scene, sima);
+}
+
static void rna_SpaceImageEditor_image_set(PointerRNA *ptr, PointerRNA value)
{
SpaceImage *sima = (SpaceImage *)(ptr->data);
@@ -1123,7 +1130,7 @@
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Mask", "Mask displayed and edited in this space");
RNA_def_property_pointer_funcs(prop, NULL, mask_set_func, NULL, NULL);
- RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list