[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48169] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48162:48168
Campbell Barton
ideasman42 at gmail.com
Thu Jun 21 16:38:45 CEST 2012
Revision: 48169
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48169
Author: campbellbarton
Date: 2012-06-21 14:38:45 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48162:48168
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48162
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48162
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48168
Modified: branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml 2012-06-21 14:38:45 UTC (rev 48169)
@@ -2,7 +2,7 @@
<Theme>
<view_3d>
<ThemeView3D object_active="#ff8c19"
- editmesh_active="#ffffff80"
+ editmesh_active="#ff020080"
act_spline="#db2512"
handle_align="#803060"
handle_sel_align="#f090a0"
@@ -461,7 +461,7 @@
<ThemeTextEditor cursor="#ff0000"
syntax_special="#969629"
line_numbers_background="#191919"
- selected_text="#ffffff"
+ selected_text="#202020"
syntax_builtin="#cf3d99"
syntax_comment="#249d60"
syntax_numbers="#3c68ff"
Modified: branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/include/ED_node.h 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/source/blender/editors/include/ED_node.h 2012-06-21 14:38:45 UTC (rev 48169)
@@ -61,6 +61,9 @@
void ED_node_post_apply_transform(struct bContext *C, struct bNodeTree *ntree);
void ED_node_set_active(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node);
+
+void ED_node_sample_set(const float col[4]);
+
/* node ops.c */
void ED_operatormacros_node(void);
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48162
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-48168
Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c 2012-06-21 14:38:45 UTC (rev 48169)
@@ -1346,7 +1346,7 @@
cumap = (CurveMapping *)(but->editcumap ? but->editcumap : but->poin);
cuma = cumap->cm + cumap->cur;
-
+
/* need scissor test, curve can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor);
scissor_new.xmin = ar->winrct.xmin + rect->xmin;
@@ -1423,10 +1423,20 @@
#endif
/* sample option */
- /* XXX 2.48 */
-#if 0
if (cumap->flag & CUMA_DRAW_SAMPLE) {
- if (cumap->cur == 3) {
+ if (but->a1 == UI_GRAD_H) {
+ float tsample[3];
+ float hsv[3];
+ linearrgb_to_srgb_v3_v3(tsample, cumap->sample);
+ rgb_to_hsv_v(tsample, hsv);
+ glColor3ub(240, 240, 240);
+
+ glBegin(GL_LINES);
+ glVertex2f(rect->xmin + zoomx * (hsv[0] - offsx), rect->ymin);
+ glVertex2f(rect->xmin + zoomx * (hsv[0] - offsx), rect->ymax);
+ glEnd();
+ }
+ else if (cumap->cur == 3) {
float lum = cumap->sample[0] * 0.35f + cumap->sample[1] * 0.45f + cumap->sample[2] * 0.2f;
glColor3ub(240, 240, 240);
@@ -1449,7 +1459,6 @@
glEnd();
}
}
-#endif
/* the curve */
glColor3ubv((unsigned char *)wcol->item);
Modified: branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c 2012-06-21 14:38:45 UTC (rev 48169)
@@ -1241,6 +1241,8 @@
else
WM_cursor_set(win, CURSOR_X_MOVE);
}
+ else
+ WM_cursor_set(win, CURSOR_STD);
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c 2012-06-21 14:38:45 UTC (rev 48169)
@@ -1926,6 +1926,7 @@
if (ibuf == NULL) {
ED_space_image_release_buffer(sima, lock);
+ info->draw = 0;
return;
}
@@ -2018,8 +2019,9 @@
}
#endif
}
- else
+ else {
info->draw = 0;
+ }
ED_space_image_release_buffer(sima, lock);
ED_area_tag_redraw(CTX_wm_area(C));
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c 2012-06-21 14:38:45 UTC (rev 48169)
@@ -341,25 +341,30 @@
uiTemplateCurveMapping(layout, ptr, "mapping", 'v', 0, 0);
}
-static float *_sample_col = NULL; // bad bad, 2.5 will do better?
-#if 0
-static void node_curvemap_sample(float *col)
+static float _sample_col[4]; // bad bad, 2.5 will do better?
+#define SAMPLE_FLT_ISNONE FLT_MAX
+void ED_node_sample_set(const float col[4])
{
- _sample_col = col;
+ if (col) {
+ copy_v4_v4(_sample_col, col);
+ }
+ else {
+ copy_v4_fl(_sample_col, SAMPLE_FLT_ISNONE);
+ }
}
-#endif
static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
bNode *node = ptr->data;
CurveMapping *cumap = node->storage;
- if (_sample_col) {
+ if (_sample_col[0] != SAMPLE_FLT_ISNONE) {
cumap->flag |= CUMA_DRAW_SAMPLE;
copy_v3_v3(cumap->sample, _sample_col);
}
- else
+ else {
cumap->flag &= ~CUMA_DRAW_SAMPLE;
+ }
uiTemplateCurveMapping(layout, ptr, "mapping", 'c', 0, 0);
}
@@ -2130,6 +2135,17 @@
static void node_composit_buts_huecorrect(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
+ bNode *node = ptr->data;
+ CurveMapping *cumap = node->storage;
+
+ if (_sample_col[0] != SAMPLE_FLT_ISNONE) {
+ cumap->flag |= CUMA_DRAW_SAMPLE;
+ copy_v3_v3(cumap->sample, _sample_col);
+ }
+ else {
+ cumap->flag &= ~CUMA_DRAW_SAMPLE;
+ }
+
uiTemplateCurveMapping(layout, ptr, "mapping", 'h', 0, 0);
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-06-21 14:37:56 UTC (rev 48168)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c 2012-06-21 14:38:45 UTC (rev 48169)
@@ -120,7 +120,7 @@
/* called by compo, only to check job 'stop' value */
static int compo_breakjob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
return *(cj->stop);
}
@@ -128,14 +128,14 @@
/* called by compo, wmJob sends notifier */
static void compo_redrawjob(void *cjv, char *UNUSED(str))
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
*(cj->do_update) = TRUE;
}
static void compo_freejob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
if (cj->localtree) {
ntreeLocalMerge(cj->localtree, cj->ntree);
@@ -147,22 +147,22 @@
* sliding buttons doesn't frustrate */
static void compo_initjob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
- cj->localtree= ntreeLocalize(cj->ntree);
+ cj->localtree = ntreeLocalize(cj->ntree);
}
/* called before redraw notifiers, it moves finished previews over */
static void compo_updatejob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
ntreeLocalSync(cj->localtree, cj->ntree);
}
static void compo_progressjob(void *cjv, float progress)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
*(cj->progress) = progress;
}
@@ -171,49 +171,49 @@
/* only this runs inside thread */
static void compo_startjob(void *cjv, short *stop, short *do_update, float *progress)
{
- CompoJob *cj= cjv;
- bNodeTree *ntree= cj->localtree;
+ CompoJob *cj = cjv;
+ bNodeTree *ntree = cj->localtree;
if (cj->scene->use_nodes == FALSE)
return;
- cj->stop= stop;
- cj->do_update= do_update;
- cj->progress= progress;
+ cj->stop = stop;
+ cj->do_update = do_update;
+ cj->progress = progress;
+
+ ntree->test_break = compo_breakjob;
+ ntree->tbh = cj;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list