Revision: 56854
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56854
Author: blendix
Date: 2013-05-16 13:10:04 +0000 (Thu, 16 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56755 -c56756 -c56763 -c56766 -c56767 -c56800
-c56816 -c56823 -c56828 -c56830 -c56833 -c56834
Modified Paths:
--------------
tags/blender-2.67a-release/blender/release/scripts/startup/bl_ui/space_node.py
tags/blender-2.67a-release/blender/source/blender/editors/include/ED_screen.h
tags/blender-2.67a-release/blender/source/blender/editors/screen/area.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_image.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_intern.h
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_stroke.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_vertex.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/sculpt.c
tags/blender-2.67a-release/blender/source/blender/editors/space_buttons/space_buttons.c
tags/blender-2.67a-release/blender/source/blender/editors/space_image/space_image.c
tags/blender-2.67a-release/blender/source/blender/windowmanager/WM_types.h
tags/blender-2.67a-release/blender/source/blender/windowmanager/intern/wm_draw.c
Property Changed:
----------------
tags/blender-2.67a-release/blender/
Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56826,56836,56839
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839
Modified:
tags/blender-2.67a-release/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
---
tags/blender-2.67a-release/blender/release/scripts/startup/bl_ui/space_node.py
2013-05-16 12:16:20 UTC (rev 56853)
+++
tags/blender-2.67a-release/blender/release/scripts/startup/bl_ui/space_node.py
2013-05-16 13:10:04 UTC (rev 56854)
@@ -77,8 +77,9 @@
layout.prop(snode_id, "use_nodes")
elif snode.tree_type == 'CompositorNodeTree':
- layout.prop(snode_id, "use_nodes")
- layout.prop(snode_id.render, "use_free_unused_nodes", text="Free
Unused")
+ if snode_id:
+ layout.prop(snode_id, "use_nodes")
+ layout.prop(snode_id.render, "use_free_unused_nodes",
text="Free Unused")
layout.prop(snode, "show_backdrop")
if snode.show_backdrop:
row = layout.row(align=True)
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/include/ED_screen.h
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/editors/include/ED_screen.h
2013-05-16 12:16:20 UTC (rev 56853)
+++
tags/blender-2.67a-release/blender/source/blender/editors/include/ED_screen.h
2013-05-16 13:10:04 UTC (rev 56854)
@@ -74,8 +74,6 @@
void ED_spacetypes_keymap(struct wmKeyConfig *keyconf);
int ED_area_header_switchbutton(const struct bContext *C, struct uiBlock
*block, int yco);
int ED_area_header_standardbuttons(const struct bContext *C, struct
uiBlock *block, int yco);
-void ED_area_overdraw(struct bContext *C);
-void ED_area_overdraw_flush(struct ScrArea *sa, struct ARegion *ar);
/* areas */
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/screen/area.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/editors/screen/area.c
2013-05-16 12:16:20 UTC (rev 56853)
+++ tags/blender-2.67a-release/blender/source/blender/editors/screen/area.c
2013-05-16 13:10:04 UTC (rev 56854)
@@ -150,25 +150,6 @@
sa->do_refresh = FALSE;
}
-/* based on screen region draw tags, set draw tags in azones, and future
region tabs etc */
-/* only exported for WM */
-void ED_area_overdraw_flush(ScrArea *sa, ARegion *ar)
-{
- AZone *az;
-
- for (az = sa->actionzones.first; az; az = az->next) {
- int xs, ys;
-
- xs = (az->x1 + az->x2) / 2;
- ys = (az->y1 + az->y2) / 2;
-
- /* test if inside */
- if (BLI_rcti_isect_pt(&ar->winrct, xs, ys)) {
- az->do_draw = TRUE;
- }
- }
-}
-
/**
* \brief Corner widgets use for dragging and splitting the view.
*/
@@ -348,49 +329,50 @@
glDisable(GL_BLEND);
}
-/* only exported for WM */
-void ED_area_overdraw(bContext *C)
+static void region_draw_azones(ScrArea *sa, ARegion *ar)
{
- wmWindow *win = CTX_wm_window(C);
- bScreen *screen = CTX_wm_screen(C);
- ScrArea *sa;
-
- /* Draw AZones, in screenspace */
- wmSubWindowSet(win, screen->mainwin);
+ AZone *az;
+ if (!sa)
+ return;
+
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ glPushMatrix();
+ glTranslatef(-ar->winrct.xmin, -ar->winrct.ymin, 0.0f);
- for (sa = screen->areabase.first; sa; sa = sa->next) {
- AZone *az;
- for (az = sa->actionzones.first; az; az = az->next) {
- if (az->do_draw) {
- if (az->type == AZONE_AREA) {
- area_draw_azone(az->x1, az->y1, az->x2,
az->y2);
- }
- else if (az->type == AZONE_REGION) {
-
- if (az->ar) {
- /* only display tab or icons
when the region is hidden */
- if (az->ar->flag &
(RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) {
- if (G.debug_value == 3)
-
region_draw_azone_icon(az);
- else if (G.debug_value
== 2)
-
region_draw_azone_tria(az);
- else if (G.debug_value
== 1)
-
region_draw_azone_tab(az);
- else
-
region_draw_azone_tab_plus(az);
- }
+ for (az = sa->actionzones.first; az; az = az->next) {
+ /* test if action zone is over this region */
+ rcti azrct;
+ BLI_rcti_init(&azrct, az->x1, az->x2, az->y1, az->y2);
+
+ if (BLI_rcti_isect(&ar->drawrct, &azrct, NULL)) {
+ if (az->type == AZONE_AREA) {
+ area_draw_azone(az->x1, az->y1, az->x2, az->y2);
+ }
+ else if (az->type == AZONE_REGION) {
+
+ if (az->ar) {
+ /* only display tab or icons when the
region is hidden */
+ if (az->ar->flag & (RGN_FLAG_HIDDEN |
RGN_FLAG_TOO_SMALL)) {
+ if (G.debug_value == 3)
+
region_draw_azone_icon(az);
+ else if (G.debug_value == 2)
+
region_draw_azone_tria(az);
+ else if (G.debug_value == 1)
+
region_draw_azone_tab(az);
+ else
+
region_draw_azone_tab_plus(az);
}
}
-
- az->do_draw = FALSE;
}
}
}
+
+ glPopMatrix();
+
glDisable(GL_BLEND);
-
}
/* only exported for WM */
@@ -455,6 +437,8 @@
ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_PIXEL);
+ region_draw_azones(sa, ar);
+
/* for debugging unneeded area redraws and partial redraw */
#if 0
glEnable(GL_BLEND);
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_image.c
2013-05-16 12:16:20 UTC (rev 56853)
+++
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_image.c
2013-05-16 13:10:04 UTC (rev 56854)
@@ -478,22 +478,6 @@
}
-static void paint_redraw(const bContext *C, PaintOperation *pop, int final)
-{
- if (pop->mode == PAINT_MODE_2D) {
- paint_2d_redraw(C, pop->custom_paint, final);
- }
- else {
- if (final) {
- /* compositor listener deals with updating */
- WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, NULL);
- }
- else {
- ED_region_tag_redraw(CTX_wm_region(C));
- }
- }
-}
-
static PaintOperation *texture_paint_init(bContext *C, wmOperator *op, const
wmEvent *event)
{
Scene *scene = CTX_data_scene(C);
@@ -547,7 +531,7 @@
float mouse[2];
float pressure;
- int redraw, eraser;
+ int eraser;
RNA_float_get_array(itemptr, "mouse", mouse);
pressure = RNA_float_get(itemptr, "pressure");
@@ -559,10 +543,10 @@
BKE_brush_size_set(scene, brush, max_ff(1.0f, startsize *
pressure));
if (pop->mode == PAINT_MODE_3D_PROJECT) {
- redraw = paint_proj_stroke(C, pop->custom_paint,
pop->prevmouse, mouse);
+ paint_proj_stroke(C, pop->custom_paint, pop->prevmouse, mouse);
}
else {
- redraw = paint_2d_stroke(pop->custom_paint, pop->prevmouse,
mouse, eraser);
+ paint_2d_stroke(pop->custom_paint, pop->prevmouse, mouse,
eraser);
}
pop->prevmouse[0] = mouse[0];
@@ -571,11 +555,18 @@
/* restore brush values */
BKE_brush_alpha_set(scene, brush, startalpha);
BKE_brush_size_set(scene, brush, startsize);
+}
+static void paint_stroke_redraw(const bContext *C, struct PaintStroke *stroke,
bool final)
+{
+ PaintOperation *pop = paint_stroke_mode_data(stroke);
- if (redraw)
- paint_redraw(C, pop, 0);
-
+ if (pop->mode == PAINT_MODE_3D_PROJECT) {
+ paint_proj_redraw(C, pop->custom_paint, final);
+ }
+ else {
+ paint_2d_redraw(C, pop->custom_paint, final);
+ }
}
static void paint_stroke_done(const bContext *C, struct PaintStroke *stroke)
@@ -584,8 +575,6 @@
ToolSettings *settings = scene->toolsettings;
PaintOperation *pop = paint_stroke_mode_data(stroke);
- paint_redraw(C, pop, 1);
-
settings->imapaint.flag &= ~IMAGEPAINT_DRAWING;
if (pop->mode == PAINT_MODE_3D_PROJECT) {
@@ -629,6 +618,7 @@
stroke = op->customdata = paint_stroke_new(C, NULL,
paint_stroke_test_start,
paint_stroke_update_step,
+ paint_stroke_redraw,
paint_stroke_done, event->type);
paint_stroke_set_mode_data(stroke, pop);
/* add modal handler */
@@ -663,7 +653,7 @@
ot->cancel = paint_stroke_cancel;
/* flags */
- ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
+ ot->flag = OPTYPE_UNDO | OPTYPE_BLOCKING;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
