2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2008-12-24 10:33:10 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2008-12-24 10:33:10 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2005 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* The Original Code is: all of this file.
|
|
|
|
*
|
2009-09-18 21:04:54 +00:00
|
|
|
* Contributor(s): David Millan Escriva, Juho Vepsäläinen, Bob Holcomb, Thomas Dinges
|
2008-12-24 10:33:10 +00:00
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
2011-02-27 20:29:51 +00:00
|
|
|
/** \file blender/editors/space_node/drawnode.c
|
|
|
|
* \ingroup spnode
|
2012-07-14 15:29:45 +00:00
|
|
|
* \brief lower level node drawing for nodes (boarders, headers etc), also node layout.
|
2011-02-27 20:29:51 +00:00
|
|
|
*/
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
#include "BLI_blenlib.h"
|
2009-11-10 20:43:45 +00:00
|
|
|
#include "BLI_math.h"
|
2008-12-24 10:33:10 +00:00
|
|
|
|
|
|
|
#include "DNA_node_types.h"
|
|
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "DNA_space_types.h"
|
|
|
|
#include "DNA_screen_types.h"
|
2014-04-05 12:49:04 +02:00
|
|
|
#include "DNA_userdef_types.h"
|
2015-01-29 21:56:32 +11:00
|
|
|
#include "DNA_text_types.h"
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2008-12-29 00:55:23 +00:00
|
|
|
#include "BKE_context.h"
|
2009-02-07 14:03:34 +00:00
|
|
|
#include "BKE_curve.h"
|
2008-12-24 10:33:10 +00:00
|
|
|
#include "BKE_image.h"
|
|
|
|
#include "BKE_main.h"
|
2011-09-05 21:01:50 +00:00
|
|
|
#include "BKE_node.h"
|
2012-06-19 17:29:58 +00:00
|
|
|
#include "BKE_tracking.h"
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-05-22 14:13:33 +00:00
|
|
|
#include "BLF_api.h"
|
2012-06-02 19:58:12 +00:00
|
|
|
#include "BLF_translation.h"
|
2012-05-22 14:13:33 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
#include "BIF_gl.h"
|
|
|
|
#include "BIF_glutil.h"
|
|
|
|
|
2008-12-29 00:55:23 +00:00
|
|
|
#include "RNA_access.h"
|
2013-03-18 16:34:57 +00:00
|
|
|
#include "RNA_define.h"
|
2008-12-29 00:55:23 +00:00
|
|
|
|
2010-11-06 17:55:43 +00:00
|
|
|
#include "ED_node.h"
|
|
|
|
|
2008-12-29 00:55:23 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
#include "UI_resources.h"
|
|
|
|
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
#include "IMB_colormanagement.h"
|
2008-12-26 18:00:38 +00:00
|
|
|
#include "IMB_imbuf_types.h"
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-08-02 23:03:16 +00:00
|
|
|
#include "node_intern.h" /* own include */
|
2013-03-18 16:34:57 +00:00
|
|
|
#include "NOD_composite.h"
|
|
|
|
#include "NOD_shader.h"
|
|
|
|
#include "NOD_texture.h"
|
2008-12-29 00:55:23 +00:00
|
|
|
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
/* ****************** SOCKET BUTTON DRAW FUNCTIONS ***************** */
|
|
|
|
|
2013-05-08 14:58:41 +00:00
|
|
|
static void node_socket_button_label(bContext *UNUSED(C), uiLayout *layout, PointerRNA *UNUSED(ptr), PointerRNA *UNUSED(node_ptr),
|
|
|
|
const char *text)
|
2011-09-05 21:01:50 +00:00
|
|
|
{
|
2013-05-08 14:58:41 +00:00
|
|
|
uiItemL(layout, text, 0);
|
2012-05-02 07:18:51 +00:00
|
|
|
}
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
|
2011-09-05 21:01:50 +00:00
|
|
|
/* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES ***************** */
|
|
|
|
|
2011-09-20 08:48:48 +00:00
|
|
|
#if 0 /* UNUSED */
|
2011-09-16 08:20:21 +00:00
|
|
|
static void node_draw_socket_new(bNodeSocket *sock, float size)
|
2011-09-05 21:01:50 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
float x = sock->locx, y = sock->locy;
|
2011-09-05 21:01:50 +00:00
|
|
|
|
|
|
|
/* 16 values of sin function */
|
|
|
|
static float si[16] = {
|
2012-05-27 19:38:10 +00:00
|
|
|
0.00000000f, 0.39435585f, 0.72479278f, 0.93775213f,
|
|
|
|
0.99871650f, 0.89780453f, 0.65137248f, 0.29936312f,
|
|
|
|
-0.10116832f, -0.48530196f, -0.79077573f, -0.96807711f,
|
|
|
|
-0.98846832f, -0.84864425f, -0.57126821f, -0.20129852f
|
2011-09-05 21:01:50 +00:00
|
|
|
};
|
|
|
|
/* 16 values of cos function */
|
2012-05-27 19:38:10 +00:00
|
|
|
static float co[16] = {
|
|
|
|
1.00000000f, 0.91895781f, 0.68896691f, 0.34730525f,
|
|
|
|
-0.05064916f, -0.44039415f, -0.75875812f, -0.95413925f,
|
|
|
|
-0.99486932f, -0.87434661f, -0.61210598f, -0.25065253f,
|
|
|
|
0.15142777f, 0.52896401f, 0.82076344f, 0.97952994f,
|
2011-09-05 21:01:50 +00:00
|
|
|
};
|
|
|
|
int a;
|
|
|
|
|
|
|
|
glColor3ub(180, 180, 180);
|
|
|
|
|
|
|
|
glBegin(GL_POLYGON);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (a = 0; a < 16; a++)
|
|
|
|
glVertex2f(x + size * si[a], y + size * co[a]);
|
2011-09-05 21:01:50 +00:00
|
|
|
glEnd();
|
|
|
|
|
|
|
|
glColor4ub(0, 0, 0, 150);
|
|
|
|
glEnable(GL_BLEND);
|
2012-04-29 17:11:40 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
2011-09-05 21:01:50 +00:00
|
|
|
glBegin(GL_LINE_LOOP);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (a = 0; a < 16; a++)
|
|
|
|
glVertex2f(x + size * si[a], y + size * co[a]);
|
2011-09-05 21:01:50 +00:00
|
|
|
glEnd();
|
2012-04-29 17:11:40 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2011-09-05 21:01:50 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
2011-09-20 08:48:48 +00:00
|
|
|
#endif
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* ****************** BUTTON CALLBACKS FOR ALL TREES ***************** */
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
/* first output stores value */
|
|
|
|
bNodeSocket *output = node->outputs.first;
|
2009-11-11 02:15:09 +00:00
|
|
|
PointerRNA sockptr;
|
2013-03-18 16:34:57 +00:00
|
|
|
RNA_pointer_create(ptr->id.data, &RNA_NodeSocket, output, &sockptr);
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-01-07 16:35:52 +01:00
|
|
|
uiItemR(layout, &sockptr, "default_value", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
/* first output stores value */
|
|
|
|
bNodeSocket *output = node->outputs.first;
|
2009-11-11 02:15:09 +00:00
|
|
|
PointerRNA sockptr;
|
2013-03-18 16:34:57 +00:00
|
|
|
uiLayout *col;
|
|
|
|
RNA_pointer_create(ptr->id.data, &RNA_NodeSocket, output, &sockptr);
|
2009-11-11 02:15:09 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, &sockptr, "default_value", 1, 0, 0, 0);
|
2014-01-02 20:54:24 +01:00
|
|
|
uiItemR(col, &sockptr, "default_value", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-27 11:00:35 +00:00
|
|
|
{
|
2012-07-10 09:12:33 +00:00
|
|
|
uiLayout *row, *col;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
bNodeTree *ntree = (bNodeTree *)ptr->id.data;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
row = uiLayoutRow(col, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "blend_type", 0, "", ICON_NONE);
|
2013-05-10 12:39:11 +00:00
|
|
|
if (ELEM(ntree->type, NTREE_COMPOSIT, NTREE_TEXTURE))
|
2010-08-21 04:51:00 +00:00
|
|
|
uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA);
|
2012-07-10 09:12:33 +00:00
|
|
|
|
|
|
|
uiItemR(col, ptr, "use_clamp", 0, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
|
|
|
uiLayout *row;
|
|
|
|
#if 0
|
|
|
|
/* XXX no context access here .. */
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
CurveMapping *cumap = node->storage;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (cumap) {
|
2009-09-16 18:59:13 +00:00
|
|
|
cumap->flag |= CUMA_DRAW_CFRA;
|
2012-05-27 19:38:10 +00:00
|
|
|
if (node->custom1 < node->custom2)
|
|
|
|
cumap->sample[0] = (float)(CFRA - node->custom1) / (float)(node->custom2 - node->custom1);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-06-30 16:20:02 +02:00
|
|
|
uiTemplateCurveMapping(layout, ptr, "curve", 's', false, false, false);
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(row, ptr, "frame_start", 0, IFACE_("Sta"), ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "frame_end", 0, IFACE_("End"), ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_colorramp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-11-10 04:01:44 +00:00
|
|
|
uiTemplateColorRamp(layout, ptr, "color_ramp", 0);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_curvevec(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2014-06-30 16:20:02 +02:00
|
|
|
uiTemplateCurveMapping(layout, ptr, "mapping", 'v', false, false, false);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2012-06-21 14:12:14 +00:00
|
|
|
#define SAMPLE_FLT_ISNONE FLT_MAX
|
2012-08-08 08:41:10 +00:00
|
|
|
static float _sample_col[4] = {SAMPLE_FLT_ISNONE}; /* bad bad, 2.5 will do better?... no it won't... */
|
2012-06-21 14:12:14 +00:00
|
|
|
void ED_node_sample_set(const float col[4])
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-06-21 14:12:14 +00:00
|
|
|
if (col) {
|
|
|
|
copy_v4_v4(_sample_col, col);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
copy_v4_fl(_sample_col, SAMPLE_FLT_ISNONE);
|
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_curvecol(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
CurveMapping *cumap = node->storage;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-06-21 14:12:14 +00:00
|
|
|
if (_sample_col[0] != SAMPLE_FLT_ISNONE) {
|
2009-09-16 18:59:13 +00:00
|
|
|
cumap->flag |= CUMA_DRAW_SAMPLE;
|
2011-09-11 02:50:01 +00:00
|
|
|
copy_v3_v3(cumap->sample, _sample_col);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
2012-06-21 14:12:14 +00:00
|
|
|
else {
|
2009-09-16 18:59:13 +00:00
|
|
|
cumap->flag &= ~CUMA_DRAW_SAMPLE;
|
2012-06-21 14:12:14 +00:00
|
|
|
}
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-06-30 16:20:02 +02:00
|
|
|
uiTemplateCurveMapping(layout, ptr, "mapping", 'c', false, false, false);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_normal(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
/* first output stores normal */
|
|
|
|
bNodeSocket *output = node->outputs.first;
|
2012-11-17 16:11:02 +00:00
|
|
|
PointerRNA sockptr;
|
2013-03-18 16:34:57 +00:00
|
|
|
RNA_pointer_create(ptr->id.data, &RNA_NodeSocket, output, &sockptr);
|
|
|
|
|
2012-11-17 16:11:02 +00:00
|
|
|
uiItemR(layout, &sockptr, "default_value", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2013-03-18 16:34:57 +00:00
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
#if 0 /* not used in 2.5x yet */
|
2008-12-29 00:55:23 +00:00
|
|
|
static void node_browse_tex_cb(bContext *C, void *ntree_v, void *node_v)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
bNodeTree *ntree = ntree_v;
|
|
|
|
bNode *node = node_v;
|
2008-12-24 10:33:10 +00:00
|
|
|
Tex *tex;
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (node->menunr < 1) return;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (node->id) {
|
2008-12-24 10:33:10 +00:00
|
|
|
node->id->us--;
|
2012-05-27 19:38:10 +00:00
|
|
|
node->id = NULL;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2012-05-27 19:38:10 +00:00
|
|
|
tex = BLI_findlink(&bmain->tex, node->menunr - 1);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
node->id = &tex->id;
|
2008-12-24 10:33:10 +00:00
|
|
|
id_us_plus(node->id);
|
2012-05-27 19:38:10 +00:00
|
|
|
BLI_strncpy(node->name, node->id->name + 2, sizeof(node->name));
|
2008-12-24 10:33:10 +00:00
|
|
|
|
|
|
|
nodeSetActive(ntree, node);
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (ntree->type == NTREE_TEXTURE)
|
2012-04-29 17:11:40 +00:00
|
|
|
ntreeTexCheckCyclics(ntree);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
|
|
|
// allqueue(REDRAWBUTSSHADING, 0);
|
|
|
|
// allqueue(REDRAWNODE, 0);
|
|
|
|
NodeTagChanged(ntree, node);
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
node->menunr = 0;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2009-11-06 22:51:08 +00:00
|
|
|
#endif
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_texture(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
short multi = (
|
2012-05-27 19:38:10 +00:00
|
|
|
node->id &&
|
|
|
|
((Tex *)node->id)->use_nodes &&
|
|
|
|
(node->type != CMP_NODE_TEXTURE) &&
|
|
|
|
(node->type != TEX_NODE_TEXTURE)
|
|
|
|
);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "texture", 0, "", ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (multi) {
|
2009-10-30 19:31:44 +00:00
|
|
|
/* Number Drawing not optimal here, better have a list*/
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "node_output", 0, "", ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_buts_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "operation", 0, "", ICON_NONE);
|
2012-07-10 09:12:33 +00:00
|
|
|
uiItemR(layout, ptr, "use_clamp", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2011-09-05 21:01:50 +00:00
|
|
|
static int node_resize_area_default(bNode *node, int x, int y)
|
|
|
|
{
|
|
|
|
if (node->flag & NODE_HIDDEN) {
|
2012-05-27 19:38:10 +00:00
|
|
|
rctf totr = node->totr;
|
2011-09-05 21:01:50 +00:00
|
|
|
/* right part of node */
|
2012-05-27 19:38:10 +00:00
|
|
|
totr.xmin = node->totr.xmax - 20.0f;
|
2012-08-23 18:25:45 +00:00
|
|
|
if (BLI_rctf_isect_pt(&totr, x, y))
|
2012-05-22 14:13:33 +00:00
|
|
|
return NODE_RESIZE_RIGHT;
|
|
|
|
else
|
|
|
|
return 0;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-22 14:13:33 +00:00
|
|
|
const float size = 10.0f;
|
2012-05-27 19:38:10 +00:00
|
|
|
rctf totr = node->totr;
|
2012-05-22 14:13:33 +00:00
|
|
|
int dir = 0;
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (x >= totr.xmax - size && x < totr.xmax && y >= totr.ymin && y < totr.ymax)
|
2012-05-22 14:13:33 +00:00
|
|
|
dir |= NODE_RESIZE_RIGHT;
|
2012-05-27 19:38:10 +00:00
|
|
|
if (x >= totr.xmin && x < totr.xmin + size && y >= totr.ymin && y < totr.ymax)
|
2012-05-22 14:13:33 +00:00
|
|
|
dir |= NODE_RESIZE_LEFT;
|
|
|
|
return dir;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ****************** BUTTON CALLBACKS FOR COMMON NODES ***************** */
|
|
|
|
|
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_draw_buttons_group(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2011-11-04 13:31:15 +00:00
|
|
|
{
|
|
|
|
uiTemplateIDBrowse(layout, C, ptr, "node_tree", NULL, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
2012-05-22 14:13:33 +00:00
|
|
|
/* XXX Does a bounding box update by iterating over all children.
|
|
|
|
* Not ideal to do this in every draw call, but doing as transform callback doesn't work,
|
|
|
|
* since the child node totr rects are not updated properly at that point.
|
|
|
|
*/
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_draw_frame_prepare(const bContext *UNUSED(C), bNodeTree *ntree, bNode *node)
|
2012-05-22 14:13:33 +00:00
|
|
|
{
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
const float margin = 1.5f * U.widget_unit;
|
2012-05-22 14:13:33 +00:00
|
|
|
NodeFrame *data = (NodeFrame *)node->storage;
|
2014-05-09 08:51:37 +02:00
|
|
|
bool bbinit;
|
2012-05-22 14:13:33 +00:00
|
|
|
bNode *tnode;
|
|
|
|
rctf rect, noderect;
|
|
|
|
float xmax, ymax;
|
|
|
|
|
|
|
|
/* init rect from current frame size */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
node_to_view(node, node->offsetx, node->offsety, &rect.xmin, &rect.ymax);
|
|
|
|
node_to_view(node, node->offsetx + node->width, node->offsety - node->height, &rect.xmax, &rect.ymin);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
|
|
|
/* frame can be resized manually only if shrinking is disabled or no children are attached */
|
|
|
|
data->flag |= NODE_FRAME_RESIZEABLE;
|
|
|
|
/* for shrinking bbox, initialize the rect from first child node */
|
|
|
|
bbinit = (data->flag & NODE_FRAME_SHRINK);
|
|
|
|
/* fit bounding box to all children */
|
2012-05-27 19:38:10 +00:00
|
|
|
for (tnode = ntree->nodes.first; tnode; tnode = tnode->next) {
|
|
|
|
if (tnode->parent != node)
|
2012-05-22 14:13:33 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* add margin to node rect */
|
|
|
|
noderect = tnode->totr;
|
|
|
|
noderect.xmin -= margin;
|
|
|
|
noderect.xmax += margin;
|
|
|
|
noderect.ymin -= margin;
|
|
|
|
noderect.ymax += margin;
|
|
|
|
|
|
|
|
/* first child initializes frame */
|
|
|
|
if (bbinit) {
|
|
|
|
bbinit = 0;
|
|
|
|
rect = noderect;
|
|
|
|
data->flag &= ~NODE_FRAME_RESIZEABLE;
|
|
|
|
}
|
|
|
|
else
|
2012-07-15 00:29:56 +00:00
|
|
|
BLI_rctf_union(&rect, &noderect);
|
2012-05-22 14:13:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* now adjust the frame size from view-space bounding box */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
node_from_view(node, rect.xmin, rect.ymax, &node->offsetx, &node->offsety);
|
|
|
|
node_from_view(node, rect.xmax, rect.ymin, &xmax, &ymax);
|
2012-05-22 14:13:33 +00:00
|
|
|
node->width = xmax - node->offsetx;
|
|
|
|
node->height = -ymax + node->offsety;
|
|
|
|
|
|
|
|
node->totr = rect;
|
|
|
|
}
|
|
|
|
|
2013-11-12 18:18:04 +00:00
|
|
|
static void node_draw_frame_label(bNodeTree *ntree, bNode *node, const float aspect)
|
2011-09-05 21:01:50 +00:00
|
|
|
{
|
2012-05-22 14:13:33 +00:00
|
|
|
/* XXX font id is crap design */
|
2014-11-09 21:20:40 +01:00
|
|
|
const int fontid = UI_style_get()->widgetlabel.uifont_id;
|
2012-05-22 14:13:33 +00:00
|
|
|
NodeFrame *data = (NodeFrame *)node->storage;
|
2012-05-27 19:38:10 +00:00
|
|
|
rctf *rct = &node->totr;
|
|
|
|
int color_id = node_get_colorid(node);
|
2013-11-12 18:17:58 +00:00
|
|
|
char label[MAX_NAME];
|
2012-05-22 14:13:33 +00:00
|
|
|
/* XXX a bit hacky, should use separate align values for x and y */
|
|
|
|
float width, ascender;
|
|
|
|
float x, y;
|
2012-07-09 16:26:01 +00:00
|
|
|
const int font_size = data->label_size / aspect;
|
2015-02-03 16:40:27 +11:00
|
|
|
const float margin = (float)(NODE_DY / 4);
|
2012-07-09 16:06:44 +00:00
|
|
|
|
2013-11-12 18:18:04 +00:00
|
|
|
nodeLabel(ntree, node, label, sizeof(label));
|
2013-11-12 18:17:58 +00:00
|
|
|
|
2012-07-09 16:06:44 +00:00
|
|
|
BLF_enable(fontid, BLF_ASPECT);
|
2012-07-09 16:26:01 +00:00
|
|
|
BLF_aspect(fontid, aspect, aspect, 1.0f);
|
2012-07-09 16:06:44 +00:00
|
|
|
BLF_size(fontid, MIN2(24, font_size), U.dpi); /* clamp otherwise it can suck up a LOT of memory */
|
2012-05-22 14:13:33 +00:00
|
|
|
|
|
|
|
/* title color */
|
2014-02-17 09:26:19 +01:00
|
|
|
UI_ThemeColorBlendShade(TH_TEXT, color_id, 0.4f, 10);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
2013-12-02 20:33:45 +11:00
|
|
|
width = BLF_width(fontid, label, sizeof(label));
|
2012-07-09 16:26:01 +00:00
|
|
|
ascender = BLF_ascender(fontid);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
2012-07-09 16:26:01 +00:00
|
|
|
/* 'x' doesn't need aspect correction */
|
2012-09-15 11:48:20 +00:00
|
|
|
x = BLI_rctf_cent_x(rct) - (0.5f * width);
|
2015-01-29 21:56:32 +11:00
|
|
|
y = rct->ymax - ((margin / aspect) + (ascender * aspect));
|
2012-07-10 20:44:25 +00:00
|
|
|
|
2012-05-22 14:13:33 +00:00
|
|
|
BLF_position(fontid, x, y, 0);
|
|
|
|
BLF_draw(fontid, label, BLF_DRAW_STR_DUMMY_MAX);
|
2012-07-09 16:06:44 +00:00
|
|
|
|
2015-01-29 21:56:32 +11:00
|
|
|
/* draw text body */
|
|
|
|
if (node->id) {
|
|
|
|
Text *text = (Text *)node->id;
|
|
|
|
TextLine *line;
|
|
|
|
const float line_spacing = (BLF_height_max(fontid) * aspect) * 0.7f;
|
|
|
|
|
|
|
|
/* 'x' doesn't need aspect correction */
|
|
|
|
x = rct->xmin + margin;
|
|
|
|
y = rct->ymax - ((margin / aspect) + (ascender * aspect));
|
|
|
|
y -= line_spacing;
|
|
|
|
|
|
|
|
BLF_enable(fontid, BLF_CLIPPING);
|
|
|
|
BLF_clipping(
|
|
|
|
fontid,
|
|
|
|
rct->xmin,
|
|
|
|
rct->ymin,
|
|
|
|
rct->xmin + ((rct->xmax - rct->xmin) / aspect) - margin,
|
|
|
|
rct->ymax);
|
|
|
|
|
|
|
|
for (line = text->lines.first; line; line = line->next) {
|
|
|
|
BLF_position(fontid, x, y, 0);
|
|
|
|
BLF_draw(fontid, line->line, line->len);
|
|
|
|
y -= line_spacing;
|
|
|
|
if (y < rct->ymin) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
BLF_disable(fontid, BLF_CLIPPING);
|
|
|
|
}
|
|
|
|
|
2012-07-09 16:06:44 +00:00
|
|
|
BLF_disable(fontid, BLF_ASPECT);
|
2012-05-22 14:13:33 +00:00
|
|
|
}
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
static void node_draw_frame(const bContext *C, ARegion *ar, SpaceNode *snode,
|
2013-11-12 18:18:04 +00:00
|
|
|
bNodeTree *ntree, bNode *node, bNodeInstanceKey UNUSED(key))
|
2012-05-22 14:13:33 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
rctf *rct = &node->totr;
|
|
|
|
int color_id = node_get_colorid(node);
|
2012-06-01 14:42:21 +00:00
|
|
|
unsigned char color[4];
|
|
|
|
float alpha;
|
|
|
|
|
2012-05-22 14:13:33 +00:00
|
|
|
/* skip if out of view */
|
2014-04-01 11:34:00 +11:00
|
|
|
if (BLI_rctf_isect(&node->totr, &ar->v2d.cur, NULL) == false) {
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_end(C, node->block);
|
2012-05-27 19:38:10 +00:00
|
|
|
node->block = NULL;
|
2012-05-22 14:13:33 +00:00
|
|
|
return;
|
|
|
|
}
|
2012-07-10 20:44:25 +00:00
|
|
|
|
|
|
|
UI_GetThemeColor4ubv(TH_NODE_FRAME, color);
|
|
|
|
alpha = (float)(color[3]) / 255.0f;
|
2012-05-22 14:13:33 +00:00
|
|
|
|
|
|
|
/* shadow */
|
2012-06-01 14:42:21 +00:00
|
|
|
node_draw_shadow(snode, node, BASIS_RAD, alpha);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
|
|
|
/* body */
|
|
|
|
if (node->flag & NODE_CUSTOM_COLOR)
|
2012-06-01 14:42:21 +00:00
|
|
|
glColor4f(node->color[0], node->color[1], node->color[2], alpha);
|
2012-05-22 14:13:33 +00:00
|
|
|
else
|
2012-06-01 14:42:21 +00:00
|
|
|
UI_ThemeColor4(TH_NODE_FRAME);
|
2012-05-22 14:13:33 +00:00
|
|
|
glEnable(GL_BLEND);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_draw_roundbox_corner_set(UI_CNR_ALL);
|
|
|
|
UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, BASIS_RAD);
|
2012-05-22 14:13:33 +00:00
|
|
|
glDisable(GL_BLEND);
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2012-05-22 14:13:33 +00:00
|
|
|
/* outline active and selected emphasis */
|
2012-08-01 09:44:25 +00:00
|
|
|
if (node->flag & SELECT) {
|
2012-05-22 14:13:33 +00:00
|
|
|
glEnable(GL_BLEND);
|
2012-05-27 19:38:10 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
|
|
|
if (node->flag & NODE_ACTIVE)
|
|
|
|
UI_ThemeColorShadeAlpha(TH_ACTIVE, 0, -40);
|
|
|
|
else
|
|
|
|
UI_ThemeColorShadeAlpha(TH_SELECT, 0, -40);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_draw_roundbox_corner_set(UI_CNR_ALL);
|
|
|
|
UI_draw_roundbox_gl_mode(GL_LINE_LOOP,
|
2012-07-09 23:07:15 +00:00
|
|
|
rct->xmin, rct->ymin,
|
|
|
|
rct->xmax, rct->ymax, BASIS_RAD);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2012-05-22 14:13:33 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* label */
|
2013-11-12 18:18:04 +00:00
|
|
|
node_draw_frame_label(ntree, node, snode->aspect);
|
2012-05-22 14:13:33 +00:00
|
|
|
|
|
|
|
UI_ThemeClearColor(color_id);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_end(C, node->block);
|
|
|
|
UI_block_draw(C, node->block);
|
2012-05-27 19:38:10 +00:00
|
|
|
node->block = NULL;
|
2012-05-22 14:13:33 +00:00
|
|
|
}
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2012-05-22 14:13:33 +00:00
|
|
|
static int node_resize_area_frame(bNode *node, int x, int y)
|
|
|
|
{
|
|
|
|
const float size = 10.0f;
|
|
|
|
NodeFrame *data = (NodeFrame *)node->storage;
|
2012-05-27 19:38:10 +00:00
|
|
|
rctf totr = node->totr;
|
2012-05-22 14:13:33 +00:00
|
|
|
int dir = 0;
|
|
|
|
|
|
|
|
/* shrinking frame size is determined by child nodes */
|
|
|
|
if (!(data->flag & NODE_FRAME_RESIZEABLE))
|
|
|
|
return 0;
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (x >= totr.xmax - size && x < totr.xmax && y >= totr.ymin && y < totr.ymax)
|
2012-05-22 14:13:33 +00:00
|
|
|
dir |= NODE_RESIZE_RIGHT;
|
2012-05-27 19:38:10 +00:00
|
|
|
if (x >= totr.xmin && x < totr.xmin + size && y >= totr.ymin && y < totr.ymax)
|
2012-05-22 14:13:33 +00:00
|
|
|
dir |= NODE_RESIZE_LEFT;
|
2012-05-27 19:38:10 +00:00
|
|
|
if (x >= totr.xmin && x < totr.xmax && y >= totr.ymax - size && y < totr.ymax)
|
2012-05-22 14:13:33 +00:00
|
|
|
dir |= NODE_RESIZE_TOP;
|
2012-05-27 19:38:10 +00:00
|
|
|
if (x >= totr.xmin && x < totr.xmax && y >= totr.ymin && y < totr.ymin + size)
|
2012-05-22 14:13:33 +00:00
|
|
|
dir |= NODE_RESIZE_BOTTOM;
|
|
|
|
|
|
|
|
return dir;
|
|
|
|
}
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_buts_frame_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2012-05-22 14:13:33 +00:00
|
|
|
{
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(layout, ptr, "label_size", 0, IFACE_("Label Size"), ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "shrink", 0, IFACE_("Shrink"), ICON_NONE);
|
2015-01-30 13:41:07 +11:00
|
|
|
uiItemR(layout, ptr, "text", 0, NULL, ICON_NONE);
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
|
2012-06-01 12:38:03 +00:00
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
#define NODE_REROUTE_SIZE 8.0f
|
2012-06-01 12:38:03 +00:00
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_draw_reroute_prepare(const bContext *UNUSED(C), bNodeTree *UNUSED(ntree), bNode *node)
|
2012-06-01 12:38:03 +00:00
|
|
|
{
|
|
|
|
bNodeSocket *nsock;
|
|
|
|
float locx, locy;
|
|
|
|
float size = NODE_REROUTE_SIZE;
|
|
|
|
|
|
|
|
/* get "global" coords */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
node_to_view(node, 0.0f, 0.0f, &locx, &locy);
|
2012-06-01 12:38:03 +00:00
|
|
|
|
|
|
|
/* reroute node has exactly one input and one output, both in the same place */
|
2012-07-09 23:07:15 +00:00
|
|
|
nsock = node->outputs.first;
|
|
|
|
nsock->locx = locx;
|
|
|
|
nsock->locy = locy;
|
2012-06-01 12:38:03 +00:00
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
nsock = node->inputs.first;
|
|
|
|
nsock->locx = locx;
|
|
|
|
nsock->locy = locy;
|
|
|
|
|
|
|
|
node->width = size * 2;
|
|
|
|
node->totr.xmin = locx - size;
|
|
|
|
node->totr.xmax = locx + size;
|
|
|
|
node->totr.ymax = locy + size;
|
|
|
|
node->totr.ymin = locy - size;
|
2012-06-01 12:38:03 +00:00
|
|
|
}
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
static void node_draw_reroute(const bContext *C, ARegion *ar, SpaceNode *UNUSED(snode),
|
|
|
|
bNodeTree *ntree, bNode *node, bNodeInstanceKey UNUSED(key))
|
2012-06-01 12:38:03 +00:00
|
|
|
{
|
|
|
|
bNodeSocket *sock;
|
2013-01-22 21:35:33 +00:00
|
|
|
char showname[128]; /* 128 used below */
|
2012-07-09 23:07:15 +00:00
|
|
|
rctf *rct = &node->totr;
|
2013-01-22 21:35:33 +00:00
|
|
|
|
|
|
|
#if 0 /* UNUSED */
|
2012-06-01 12:38:03 +00:00
|
|
|
float size = NODE_REROUTE_SIZE;
|
2012-07-09 23:07:15 +00:00
|
|
|
#endif
|
|
|
|
float socket_size = NODE_SOCKSIZE;
|
2012-06-01 12:38:03 +00:00
|
|
|
|
|
|
|
/* skip if out of view */
|
|
|
|
if (node->totr.xmax < ar->v2d.cur.xmin || node->totr.xmin > ar->v2d.cur.xmax ||
|
2013-03-01 14:47:06 +00:00
|
|
|
node->totr.ymax < ar->v2d.cur.ymin || node->totr.ymin > ar->v2d.cur.ymax)
|
|
|
|
{
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_end(C, node->block);
|
2012-07-09 23:07:15 +00:00
|
|
|
node->block = NULL;
|
2012-06-01 12:38:03 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX only kept for debugging
|
|
|
|
* selection state is indicated by socket outline below!
|
|
|
|
*/
|
2012-06-17 09:58:26 +00:00
|
|
|
#if 0
|
2012-06-01 12:38:03 +00:00
|
|
|
/* body */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_draw_roundbox_corner_set(UI_CNR_ALL);
|
2012-06-01 12:38:03 +00:00
|
|
|
UI_ThemeColor4(TH_NODE);
|
|
|
|
glEnable(GL_BLEND);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_draw_roundbox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);
|
2012-06-01 12:38:03 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
|
|
|
|
/* outline active and selected emphasis */
|
2012-08-03 11:39:34 +00:00
|
|
|
if (node->flag & SELECT) {
|
2012-06-01 12:38:03 +00:00
|
|
|
glEnable(GL_BLEND);
|
2012-06-17 09:58:26 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
2012-07-09 23:07:15 +00:00
|
|
|
/* using different shades of TH_TEXT_HI for the empasis, like triangle */
|
|
|
|
if (node->flag & NODE_ACTIVE)
|
|
|
|
UI_ThemeColorShadeAlpha(TH_TEXT_HI, 0, -40);
|
|
|
|
else
|
|
|
|
UI_ThemeColorShadeAlpha(TH_TEXT_HI, -20, -120);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_draw_roundbox_gl_mode(GL_LINE_LOOP, rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);
|
2012-06-01 12:38:03 +00:00
|
|
|
|
2012-06-17 09:58:26 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2012-06-01 12:38:03 +00:00
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
2012-06-17 09:58:26 +00:00
|
|
|
#endif
|
2012-06-01 12:38:03 +00:00
|
|
|
|
2013-01-22 21:35:33 +00:00
|
|
|
if (node->label[0] != '\0') {
|
|
|
|
/* draw title (node label) */
|
|
|
|
BLI_strncpy(showname, node->label, sizeof(showname));
|
2014-11-09 21:20:40 +01:00
|
|
|
uiDefBut(node->block, UI_BTYPE_LABEL, 0, showname,
|
2013-01-23 23:42:18 +00:00
|
|
|
(int)(rct->xmin - NODE_DYS), (int)(rct->ymax),
|
|
|
|
(short)512, (short)NODE_DY,
|
|
|
|
NULL, 0, 0, 0, 0, NULL);
|
2013-01-22 21:35:33 +00:00
|
|
|
}
|
|
|
|
|
2012-06-01 12:38:03 +00:00
|
|
|
/* only draw input socket. as they all are placed on the same position.
|
|
|
|
* highlight also if node itself is selected, since we don't display the node body separately!
|
|
|
|
*/
|
2012-07-09 23:07:15 +00:00
|
|
|
for (sock = node->inputs.first; sock; sock = sock->next) {
|
2013-03-18 16:34:57 +00:00
|
|
|
node_socket_circle_draw(C, ntree, node, sock, socket_size, (sock->flag & SELECT) || (node->flag & SELECT));
|
2012-06-01 12:38:03 +00:00
|
|
|
}
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_end(C, node->block);
|
|
|
|
UI_block_draw(C, node->block);
|
2012-07-09 23:07:15 +00:00
|
|
|
node->block = NULL;
|
2012-06-01 12:38:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Special tweak area for reroute node.
|
|
|
|
* Since this node is quite small, we use a larger tweak area for grabbing than for selection.
|
|
|
|
*/
|
|
|
|
static int node_tweak_area_reroute(bNode *node, int x, int y)
|
|
|
|
{
|
|
|
|
/* square of tweak radius */
|
2014-10-13 15:41:19 +02:00
|
|
|
const float tweak_radius_sq = SQUARE(24);
|
2012-06-01 12:38:03 +00:00
|
|
|
|
|
|
|
bNodeSocket *sock = node->inputs.first;
|
|
|
|
float dx = sock->locx - x;
|
|
|
|
float dy = sock->locy - y;
|
2012-07-09 23:07:15 +00:00
|
|
|
return (dx * dx + dy * dy <= tweak_radius_sq);
|
2012-06-01 12:38:03 +00:00
|
|
|
}
|
|
|
|
|
2011-09-05 21:01:50 +00:00
|
|
|
static void node_common_set_butfunc(bNodeType *ntype)
|
|
|
|
{
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (ntype->type) {
|
2011-09-05 21:01:50 +00:00
|
|
|
case NODE_GROUP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_draw_buttons_group;
|
2011-09-05 21:01:50 +00:00
|
|
|
break;
|
|
|
|
case NODE_FRAME:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_nodetype = node_draw_frame;
|
|
|
|
ntype->draw_nodetype_prepare = node_draw_frame_prepare;
|
|
|
|
ntype->draw_buttons_ex = node_buts_frame_ex;
|
2012-05-27 19:38:10 +00:00
|
|
|
ntype->resize_area_func = node_resize_area_frame;
|
2011-09-05 21:01:50 +00:00
|
|
|
break;
|
2012-06-01 12:38:03 +00:00
|
|
|
case NODE_REROUTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_nodetype = node_draw_reroute;
|
|
|
|
ntype->draw_nodetype_prepare = node_draw_reroute_prepare;
|
2012-07-09 23:07:15 +00:00
|
|
|
ntype->tweak_area_func = node_tweak_area_reroute;
|
2012-06-01 12:38:03 +00:00
|
|
|
break;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
|
2012-06-04 19:38:33 +00:00
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
static void node_buts_image_user(uiLayout *layout, bContext *C, PointerRNA *ptr,
|
|
|
|
PointerRNA *imaptr, PointerRNA *iuserptr)
|
2012-06-04 19:38:33 +00:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
int source;
|
|
|
|
|
2012-06-17 09:58:26 +00:00
|
|
|
if (!imaptr->data)
|
2012-06-04 19:38:33 +00:00
|
|
|
return;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-06-04 19:38:33 +00:00
|
|
|
|
|
|
|
uiItemR(col, imaptr, "source", 0, "", ICON_NONE);
|
|
|
|
|
|
|
|
source = RNA_enum_get(imaptr, "source");
|
|
|
|
|
|
|
|
if (source == IMA_SRC_SEQUENCE) {
|
|
|
|
/* don't use iuser->framenr directly because it may not be updated if auto-refresh is off */
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
ImageUser *iuser = iuserptr->data;
|
2014-01-21 12:27:38 +11:00
|
|
|
/* Image *ima = imaptr->data; */ /* UNUSED */
|
2014-01-20 18:54:03 +01:00
|
|
|
|
2012-06-04 19:38:33 +00:00
|
|
|
char numstr[32];
|
2012-07-03 14:04:39 +00:00
|
|
|
const int framenr = BKE_image_user_frame_get(iuser, CFRA, 0, NULL);
|
2012-06-04 19:38:33 +00:00
|
|
|
BLI_snprintf(numstr, sizeof(numstr), IFACE_("Frame: %d"), framenr);
|
|
|
|
uiItemL(layout, numstr, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ELEM(source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-28 10:59:40 +00:00
|
|
|
uiItemR(col, ptr, "frame_duration", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "frame_start", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "frame_offset", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_cyclic", 0, NULL, ICON_NONE);
|
2014-02-17 17:51:20 +01:00
|
|
|
uiItemR(col, ptr, "use_auto_refresh", 0, NULL, ICON_NONE);
|
2012-06-04 19:38:33 +00:00
|
|
|
}
|
|
|
|
|
2015-04-06 10:40:12 -03:00
|
|
|
if (RNA_enum_get(imaptr, "type") == IMA_TYPE_MULTILAYER &&
|
|
|
|
RNA_boolean_get(ptr, "has_layers"))
|
|
|
|
{
|
2015-02-09 23:11:30 +01:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-06-28 10:59:40 +00:00
|
|
|
uiItemR(col, ptr, "layer", 0, NULL, ICON_NONE);
|
2015-02-09 23:11:30 +01:00
|
|
|
}
|
2012-06-04 19:38:33 +00:00
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
2009-11-10 04:01:44 +00:00
|
|
|
uiLayout *col;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2010-08-04 12:18:07 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "material", "MATERIAL_OT_new", NULL, NULL);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!node->id) return;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_diffuse", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_specular", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "invert_normal", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2014-02-04 13:21:30 +01:00
|
|
|
uiLayout *row, *col, *sub;
|
|
|
|
|
2013-10-02 17:02:59 +00:00
|
|
|
uiItemR(layout, ptr, "vector_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2013-09-25 20:28:49 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2014-02-04 13:21:30 +01:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(row, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiItemL(col, IFACE_("Location:"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "translation", 0, "", ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(row, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiItemL(col, IFACE_("Rotation:"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "rotation", 0, "", ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(row, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiItemL(col, IFACE_("Scale:"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "scale", 0, "", ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2014-02-04 13:21:30 +01:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(row, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiItemR(col, ptr, "use_min", 0, IFACE_("Min"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
sub = uiLayoutColumn(col, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min"));
|
|
|
|
uiItemR(sub, ptr, "min", 0, "", ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(row, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiItemR(col, ptr, "use_max", 0, IFACE_("Max"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
sub = uiLayoutColumn(col, true);
|
2014-02-04 13:21:30 +01:00
|
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max"));
|
|
|
|
uiItemR(sub, ptr, "max", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_shader_buts_vect_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "operation", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2013-07-31 21:18:23 +00:00
|
|
|
static void node_shader_buts_vect_transform(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2013-10-02 17:02:59 +00:00
|
|
|
uiItemR(layout, ptr, "vector_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2013-07-31 21:18:23 +00:00
|
|
|
uiItemR(layout, ptr, "convert_from", 0, "", ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "convert_to", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
|
2009-11-10 04:01:44 +00:00
|
|
|
uiLayout *col;
|
2010-04-15 10:28:32 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2010-04-15 10:28:32 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
|
2012-05-27 19:38:10 +00:00
|
|
|
PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
|
2010-04-15 10:28:32 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemPointerR(col, ptr, "uv_layer", &dataptr, "uv_textures", "", ICON_NONE);
|
|
|
|
uiItemPointerR(col, ptr, "color_layer", &dataptr, "vertex_colors", "", ICON_NONE);
|
2010-04-15 10:28:32 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "uv_layer", 0, IFACE_("UV"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "color_layer", 0, IFACE_("VCol"), ICON_NONE);
|
2010-04-15 10:28:32 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2013-11-25 20:58:23 +09:00
|
|
|
static void node_shader_buts_lamp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "lamp_object", 0, IFACE_("Lamp Object"), ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2011-11-08 11:38:16 +00:00
|
|
|
static void node_shader_buts_attribute(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(layout, ptr, "attribute_name", 0, IFACE_("Name"), ICON_NONE);
|
2011-11-08 11:38:16 +00:00
|
|
|
}
|
|
|
|
|
2013-05-20 15:58:37 +00:00
|
|
|
static void node_shader_buts_wireframe(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "use_pixel_size", 0, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2011-11-08 11:38:16 +00:00
|
|
|
static void node_shader_buts_tex_image(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-06-04 19:38:33 +00:00
|
|
|
PointerRNA imaptr = RNA_pointer_get(ptr, "image");
|
|
|
|
PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
|
|
|
|
|
2014-01-20 18:54:03 +01:00
|
|
|
uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
|
2011-11-08 11:38:16 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
|
|
|
|
uiItemR(layout, ptr, "color_space", 0, "", ICON_NONE);
|
2014-03-07 23:16:09 +01:00
|
|
|
uiItemR(layout, ptr, "interpolation", 0, "", ICON_NONE);
|
2015-01-15 21:21:53 +01:00
|
|
|
uiItemR(layout, ptr, "projection", 0, "", ICON_NONE);
|
2012-09-04 13:29:07 +00:00
|
|
|
|
2012-09-08 06:40:03 +00:00
|
|
|
if (RNA_enum_get(ptr, "projection") == SHD_PROJ_BOX) {
|
2012-09-04 13:29:07 +00:00
|
|
|
uiItemR(layout, ptr, "projection_blend", 0, "Blend", ICON_NONE);
|
2012-09-08 06:40:03 +00:00
|
|
|
}
|
2011-11-08 11:38:16 +00:00
|
|
|
|
2015-07-21 22:09:52 +02:00
|
|
|
uiItemR(layout, ptr, "extension", 0, "", ICON_NONE);
|
|
|
|
|
2012-07-02 16:27:09 +00:00
|
|
|
/* note: image user properties used directly here, unlike compositor image node,
|
|
|
|
* which redefines them in the node struct RNA to get proper updates.
|
|
|
|
*/
|
|
|
|
node_buts_image_user(layout, C, &iuserptr, &imaptr, &iuserptr);
|
2012-06-04 19:38:33 +00:00
|
|
|
}
|
2012-03-08 19:52:58 +00:00
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_shader_buts_tex_image_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2013-07-22 08:56:51 +00:00
|
|
|
{
|
|
|
|
PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
|
2015-06-13 14:04:39 -03:00
|
|
|
uiTemplateImage(layout, C, ptr, "image", &iuserptr, 0, 0);
|
2013-07-22 08:56:51 +00:00
|
|
|
}
|
|
|
|
|
2012-03-08 19:52:58 +00:00
|
|
|
static void node_shader_buts_tex_environment(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-06-04 19:38:33 +00:00
|
|
|
PointerRNA imaptr = RNA_pointer_get(ptr, "image");
|
|
|
|
PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
|
|
|
|
|
2014-01-20 18:54:03 +01:00
|
|
|
uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
|
2012-03-08 19:52:58 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
|
2012-06-04 19:38:33 +00:00
|
|
|
|
2012-12-11 11:22:51 +00:00
|
|
|
node_buts_image_user(layout, C, &iuserptr, &imaptr, &iuserptr);
|
2015-02-09 23:11:30 +01:00
|
|
|
|
|
|
|
uiItemR(layout, ptr, "color_space", 0, "", ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "projection", 0, "", ICON_NONE);
|
2012-03-08 19:52:58 +00:00
|
|
|
}
|
|
|
|
|
2015-02-09 22:25:12 +01:00
|
|
|
static void node_shader_buts_tex_environment_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
PointerRNA imaptr = RNA_pointer_get(ptr, "image");
|
|
|
|
PointerRNA iuserptr = RNA_pointer_get(ptr, "image_user");
|
|
|
|
Image *ima = imaptr.data;
|
|
|
|
|
|
|
|
uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
|
2015-02-09 23:11:30 +01:00
|
|
|
uiTemplateID(layout, C, ptr, "image", ima ? NULL : "IMAGE_OT_new", "IMAGE_OT_open", NULL);
|
2015-02-09 22:25:12 +01:00
|
|
|
|
2015-02-09 23:11:30 +01:00
|
|
|
if (!ima)
|
|
|
|
return;
|
|
|
|
|
|
|
|
uiItemR(layout, &imaptr, "source", 0, IFACE_("Source"), ICON_NONE);
|
|
|
|
|
|
|
|
if (!(ELEM(ima->source, IMA_SRC_GENERATED, IMA_SRC_VIEWER))) {
|
2015-02-09 22:25:12 +01:00
|
|
|
uiLayout *row = uiLayoutRow(layout, true);
|
2015-05-22 23:28:41 +02:00
|
|
|
const bool is_packed = BKE_image_has_packedfile(ima);
|
2015-02-09 22:25:12 +01:00
|
|
|
|
2015-05-22 23:28:41 +02:00
|
|
|
if (is_packed)
|
2015-02-09 22:25:12 +01:00
|
|
|
uiItemO(row, "", ICON_PACKAGE, "image.unpack");
|
|
|
|
else
|
|
|
|
uiItemO(row, "", ICON_UGLYPACKAGE, "image.pack");
|
|
|
|
|
|
|
|
row = uiLayoutRow(row, true);
|
2015-05-22 23:28:41 +02:00
|
|
|
uiLayoutSetEnabled(row, !is_packed);
|
2015-02-09 22:25:12 +01:00
|
|
|
uiItemR(row, &imaptr, "filepath", 0, "", ICON_NONE);
|
|
|
|
uiItemO(row, "", ICON_FILE_REFRESH, "image.reload");
|
|
|
|
}
|
|
|
|
|
2015-02-09 23:11:30 +01:00
|
|
|
/* multilayer? */
|
|
|
|
if (ima->type == IMA_TYPE_MULTILAYER && ima->rr) {
|
|
|
|
uiTemplateImageLayers(layout, C, ima, iuserptr.data);
|
|
|
|
}
|
|
|
|
else if (ima->source != IMA_SRC_GENERATED) {
|
|
|
|
uiTemplateImageInfo(layout, C, ima, iuserptr.data);
|
|
|
|
}
|
2015-02-09 22:25:12 +01:00
|
|
|
|
2015-02-09 23:11:30 +01:00
|
|
|
uiItemR(layout, ptr, "color_space", 0, IFACE_("Color Space"), ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "projection", 0, IFACE_("Projection"), ICON_NONE);
|
2015-02-09 22:25:12 +01:00
|
|
|
}
|
|
|
|
|
2011-11-08 11:38:16 +00:00
|
|
|
static void node_shader_buts_tex_sky(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2013-08-28 14:11:28 +00:00
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "sky_type", 0, "", ICON_NONE);
|
2011-11-08 11:38:16 +00:00
|
|
|
uiItemR(layout, ptr, "sun_direction", 0, "", ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "turbidity", 0, NULL, ICON_NONE);
|
2013-08-28 14:11:28 +00:00
|
|
|
|
|
|
|
if (RNA_enum_get(ptr, "sky_type") == SHD_SKY_NEW)
|
|
|
|
uiItemR(layout, ptr, "ground_albedo", 0, NULL, ICON_NONE);
|
2011-11-08 11:38:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void node_shader_buts_tex_gradient(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "gradient_type", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_shader_buts_tex_magic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "turbulence_depth", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-09-04 13:29:07 +00:00
|
|
|
static void node_shader_buts_tex_brick(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2014-01-02 20:54:24 +01:00
|
|
|
uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, IFACE_("Offset"), ICON_NONE);
|
2012-09-04 13:29:07 +00:00
|
|
|
uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"), ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-09-04 13:29:07 +00:00
|
|
|
uiItemR(col, ptr, "squash", 0, IFACE_("Squash"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "squash_frequency", 0, IFACE_("Frequency"), ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2011-11-08 11:38:16 +00:00
|
|
|
static void node_shader_buts_tex_wave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "wave_type", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_shader_buts_tex_musgrave(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "musgrave_type", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "coloring", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2015-07-18 22:36:09 +02:00
|
|
|
static void node_shader_buts_tex_pointdensity(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
bNode *node = ptr->data;
|
|
|
|
NodeShaderTexPointDensity *shader_point_density = node->storage;
|
|
|
|
|
|
|
|
uiItemR(layout, ptr, "point_source", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "object", 0, NULL, ICON_NONE);
|
|
|
|
|
|
|
|
if (node->id && shader_point_density->point_source == SHD_POINTDENSITY_SOURCE_PSYS) {
|
|
|
|
PointerRNA dataptr;
|
|
|
|
RNA_id_pointer_create((ID *)node->id, &dataptr);
|
|
|
|
uiItemPointerR(layout, ptr, "particle_system", &dataptr, "particle_systems", NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
uiItemR(layout, ptr, "space", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "radius", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "interpolation", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "resolution", 0, NULL, ICON_NONE);
|
|
|
|
if (shader_point_density->point_source == SHD_POINTDENSITY_SOURCE_PSYS) {
|
|
|
|
uiItemR(layout, ptr, "color_source", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-04 21:40:39 +00:00
|
|
|
static void node_shader_buts_tex_coord(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2015-01-21 22:19:31 +05:00
|
|
|
uiItemR(layout, ptr, "object", 0, NULL, 0);
|
2012-10-04 21:40:39 +00:00
|
|
|
uiItemR(layout, ptr, "from_dupli", 0, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2013-05-10 16:57:17 +00:00
|
|
|
static void node_shader_buts_bump(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "invert", 0, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2014-04-02 11:40:29 +02:00
|
|
|
static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "from_dupli", 0, NULL, 0);
|
|
|
|
|
2014-04-03 09:24:09 +11:00
|
|
|
if (!RNA_boolean_get(ptr, "from_dupli")) {
|
2014-04-02 11:40:29 +02:00
|
|
|
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
|
|
|
|
|
|
|
|
if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
|
|
|
|
PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
|
|
|
|
uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-11 17:13:38 +09:00
|
|
|
static void node_shader_buts_uvalongstroke(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2014-07-20 12:14:31 +09:00
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "use_tips", 0, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2012-11-06 20:48:26 +00:00
|
|
|
static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2012-11-06 19:59:02 +00:00
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "space", 0, "", 0);
|
|
|
|
|
2012-11-07 01:02:28 +00:00
|
|
|
if (RNA_enum_get(ptr, "space") == SHD_NORMAL_MAP_TANGENT) {
|
2012-11-06 20:48:26 +00:00
|
|
|
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
|
|
|
|
|
2012-11-07 01:02:28 +00:00
|
|
|
if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
|
2012-11-06 20:48:26 +00:00
|
|
|
PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
|
|
|
|
uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
uiItemR(layout, ptr, "uv_map", 0, "", 0);
|
|
|
|
}
|
2012-11-06 19:59:02 +00:00
|
|
|
}
|
|
|
|
|
2012-11-06 20:48:26 +00:00
|
|
|
static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2012-11-06 19:59:02 +00:00
|
|
|
{
|
|
|
|
uiLayout *split, *row;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
split = uiLayoutSplit(layout, 0.0f, false);
|
2012-11-06 19:59:02 +00:00
|
|
|
|
|
|
|
uiItemR(split, ptr, "direction_type", 0, "", 0);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(split, false);
|
2012-11-06 19:59:02 +00:00
|
|
|
|
2012-11-07 01:02:28 +00:00
|
|
|
if (RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) {
|
2012-11-06 20:48:26 +00:00
|
|
|
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
|
|
|
|
|
2012-11-07 01:02:28 +00:00
|
|
|
if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
|
2012-11-06 20:48:26 +00:00
|
|
|
PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
|
|
|
|
uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
uiItemR(row, ptr, "uv_map", 0, "", 0);
|
|
|
|
}
|
2012-11-06 19:59:02 +00:00
|
|
|
else
|
|
|
|
uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, 0);
|
|
|
|
}
|
|
|
|
|
2011-11-08 11:38:16 +00:00
|
|
|
static void node_shader_buts_glossy(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "distribution", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2014-06-08 12:16:28 +02:00
|
|
|
static void node_shader_buts_anisotropic(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "distribution", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2013-09-27 10:53:55 +00:00
|
|
|
static void node_shader_buts_subsurface(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2014-08-26 17:02:03 +02:00
|
|
|
/* SSS only enabled in Experimental Kernel */
|
2013-09-27 10:53:55 +00:00
|
|
|
PointerRNA scene = CTX_data_pointer_get(C, "scene");
|
|
|
|
if (scene.data) {
|
|
|
|
PointerRNA cscene = RNA_pointer_get(&scene, "cycles");
|
2014-08-27 09:49:31 +10:00
|
|
|
if (cscene.data &&
|
|
|
|
((U.compute_device_type != USER_COMPUTE_DEVICE_NONE) &&
|
|
|
|
(RNA_enum_get(&cscene, "device") == 1) &&
|
|
|
|
(RNA_enum_get(&cscene, "feature_set") == 0)))
|
|
|
|
{
|
2014-08-26 17:02:03 +02:00
|
|
|
uiItemL(layout, IFACE_("Only enabled in experimental GPU kernel"), ICON_ERROR);
|
2014-08-27 09:49:31 +10:00
|
|
|
}
|
2013-09-27 10:53:55 +00:00
|
|
|
}
|
|
|
|
|
2013-08-18 14:15:57 +00:00
|
|
|
uiItemR(layout, ptr, "falloff", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2013-12-28 16:56:19 +01:00
|
|
|
|
2013-05-23 17:45:20 +00:00
|
|
|
static void node_shader_buts_toon(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "component", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2013-09-15 23:58:00 +00:00
|
|
|
static void node_shader_buts_hair(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "component", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-11-03 14:32:26 +00:00
|
|
|
static void node_shader_buts_script(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *row;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-11-03 14:32:26 +00:00
|
|
|
uiItemR(row, ptr, "mode", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
2012-11-03 14:32:26 +00:00
|
|
|
|
2012-11-03 15:35:03 +00:00
|
|
|
if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_INTERNAL)
|
2012-11-03 14:32:26 +00:00
|
|
|
uiItemR(row, ptr, "script", 0, "", ICON_NONE);
|
|
|
|
else
|
2012-11-03 15:35:03 +00:00
|
|
|
uiItemR(row, ptr, "filepath", 0, "", ICON_NONE);
|
2012-11-03 14:32:26 +00:00
|
|
|
|
|
|
|
uiItemO(row, "", ICON_FILE_REFRESH, "node.shader_script_update");
|
|
|
|
}
|
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_shader_buts_script_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2012-11-03 14:32:26 +00:00
|
|
|
{
|
|
|
|
uiItemS(layout);
|
|
|
|
|
|
|
|
node_shader_buts_script(layout, C, ptr);
|
|
|
|
|
2012-11-18 01:22:31 +00:00
|
|
|
#if 0 /* not implemented yet */
|
2012-11-07 01:02:28 +00:00
|
|
|
if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_EXTERNAL)
|
2012-11-18 01:22:31 +00:00
|
|
|
uiItemR(layout, ptr, "use_auto_update", 0, NULL, ICON_NONE);
|
|
|
|
#endif
|
2012-11-03 14:32:26 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 22:25:37 +09:00
|
|
|
static void node_buts_output_linestyle(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *row, *col;
|
|
|
|
|
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
row = uiLayoutRow(col, true);
|
|
|
|
uiItemR(row, ptr, "blend_type", 0, "", ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_clamp", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* only once called */
|
|
|
|
static void node_shader_set_butfunc(bNodeType *ntype)
|
|
|
|
{
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (ntype->type) {
|
2008-12-24 10:33:10 +00:00
|
|
|
case SH_NODE_MATERIAL:
|
|
|
|
case SH_NODE_MATERIAL_EXT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_material;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEXTURE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_texture;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_NORMAL:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_normal;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_CURVE_VEC:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_curvevec;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_CURVE_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_curvecol;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_MAPPING:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_mapping;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_VALUE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_value;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_rgb;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_MIX_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_mix_rgb;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_VALTORGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_colorramp;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_MATH:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_math;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_VECT_MATH:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_vect_math;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2013-07-31 21:18:23 +00:00
|
|
|
case SH_NODE_VECT_TRANSFORM:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_vect_transform;
|
2013-07-31 21:18:23 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case SH_NODE_GEOMETRY:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_geometry;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2013-11-25 20:58:23 +09:00
|
|
|
case SH_NODE_LAMP:
|
|
|
|
ntype->draw_buttons = node_shader_buts_lamp;
|
|
|
|
break;
|
2011-11-08 11:38:16 +00:00
|
|
|
case SH_NODE_ATTRIBUTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_attribute;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
2013-05-20 15:58:37 +00:00
|
|
|
case SH_NODE_WIREFRAME:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_wireframe;
|
2013-05-20 15:58:37 +00:00
|
|
|
break;
|
2011-11-08 11:38:16 +00:00
|
|
|
case SH_NODE_TEX_SKY:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_sky;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEX_IMAGE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_image;
|
|
|
|
ntype->draw_buttons_ex = node_shader_buts_tex_image_ex;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEX_ENVIRONMENT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_environment;
|
2015-02-09 22:25:12 +01:00
|
|
|
ntype->draw_buttons_ex = node_shader_buts_tex_environment_ex;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEX_GRADIENT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_gradient;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEX_MAGIC:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_magic;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
2012-09-04 13:29:07 +00:00
|
|
|
case SH_NODE_TEX_BRICK:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_brick;
|
2012-09-04 13:29:07 +00:00
|
|
|
break;
|
2011-11-08 11:38:16 +00:00
|
|
|
case SH_NODE_TEX_WAVE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_wave;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEX_MUSGRAVE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_musgrave;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TEX_VORONOI:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_voronoi;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
2015-07-18 22:36:09 +02:00
|
|
|
case SH_NODE_TEX_POINTDENSITY:
|
|
|
|
ntype->draw_buttons = node_shader_buts_tex_pointdensity;
|
|
|
|
break;
|
2012-10-04 21:40:39 +00:00
|
|
|
case SH_NODE_TEX_COORD:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tex_coord;
|
2012-10-04 21:40:39 +00:00
|
|
|
break;
|
2013-05-10 16:57:17 +00:00
|
|
|
case SH_NODE_BUMP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_bump;
|
2013-05-10 16:57:17 +00:00
|
|
|
break;
|
2012-11-06 19:59:02 +00:00
|
|
|
case SH_NODE_NORMAL_MAP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_normal_map;
|
2012-11-06 19:59:02 +00:00
|
|
|
break;
|
|
|
|
case SH_NODE_TANGENT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_tangent;
|
2012-11-06 19:59:02 +00:00
|
|
|
break;
|
2011-11-08 11:38:16 +00:00
|
|
|
case SH_NODE_BSDF_GLOSSY:
|
|
|
|
case SH_NODE_BSDF_GLASS:
|
2012-11-06 19:59:02 +00:00
|
|
|
case SH_NODE_BSDF_REFRACTION:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_glossy;
|
2011-11-08 11:38:16 +00:00
|
|
|
break;
|
2014-06-08 12:16:28 +02:00
|
|
|
case SH_NODE_BSDF_ANISOTROPIC:
|
|
|
|
ntype->draw_buttons = node_shader_buts_anisotropic;
|
|
|
|
break;
|
2013-08-18 14:15:57 +00:00
|
|
|
case SH_NODE_SUBSURFACE_SCATTERING:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_subsurface;
|
2013-08-18 14:15:57 +00:00
|
|
|
break;
|
2013-05-23 17:45:20 +00:00
|
|
|
case SH_NODE_BSDF_TOON:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_toon;
|
2013-05-23 17:45:20 +00:00
|
|
|
break;
|
2013-09-15 23:58:00 +00:00
|
|
|
case SH_NODE_BSDF_HAIR:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_hair;
|
2013-09-15 23:58:00 +00:00
|
|
|
break;
|
2012-11-03 14:32:26 +00:00
|
|
|
case SH_NODE_SCRIPT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_shader_buts_script;
|
|
|
|
ntype->draw_buttons_ex = node_shader_buts_script_ex;
|
2012-11-03 14:32:26 +00:00
|
|
|
break;
|
2014-04-02 11:40:29 +02:00
|
|
|
case SH_NODE_UVMAP:
|
|
|
|
ntype->draw_buttons = node_shader_buts_uvmap;
|
|
|
|
break;
|
2014-07-20 12:14:31 +09:00
|
|
|
case SH_NODE_UVALONGSTROKE:
|
|
|
|
ntype->draw_buttons = node_shader_buts_uvalongstroke;
|
|
|
|
break;
|
2014-07-16 22:25:37 +09:00
|
|
|
case SH_NODE_OUTPUT_LINESTYLE:
|
|
|
|
ntype->draw_buttons = node_buts_output_linestyle;
|
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ****************** BUTTON CALLBACKS FOR COMPOSITE NODES ***************** */
|
|
|
|
|
2015-04-06 10:40:12 -03:00
|
|
|
static void node_buts_image_views(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr,
|
|
|
|
PointerRNA *imaptr)
|
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
|
|
|
if (!imaptr->data)
|
|
|
|
return;
|
|
|
|
|
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
|
|
|
|
if (RNA_boolean_get(ptr, "has_views")) {
|
|
|
|
if (RNA_enum_get(ptr, "view") == 0)
|
|
|
|
uiItemR(col, ptr, "view", 0, NULL, ICON_CAMERA_STEREO);
|
|
|
|
else
|
|
|
|
uiItemR(col, ptr, "view", 0, NULL, ICON_SCENE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
2012-06-10 07:51:57 +00:00
|
|
|
PointerRNA imaptr, iuserptr;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2014-01-20 18:54:03 +01:00
|
|
|
RNA_pointer_create((ID *)ptr->id.data, &RNA_ImageUser, node->storage, &iuserptr);
|
|
|
|
uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
|
2010-08-04 12:18:07 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!node->id) return;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-06-10 07:51:57 +00:00
|
|
|
imaptr = RNA_pointer_get(ptr, "image");
|
2014-01-20 18:54:03 +01:00
|
|
|
|
2012-06-28 10:59:40 +00:00
|
|
|
node_buts_image_user(layout, C, ptr, &imaptr, &iuserptr);
|
2015-04-06 10:40:12 -03:00
|
|
|
|
|
|
|
node_buts_image_views(layout, C, ptr, &imaptr);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_composit_buts_image_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2012-09-25 10:14:07 +00:00
|
|
|
{
|
|
|
|
bNode *node = ptr->data;
|
2013-07-22 08:56:51 +00:00
|
|
|
PointerRNA iuserptr;
|
2012-09-25 10:14:07 +00:00
|
|
|
|
2013-07-22 08:56:51 +00:00
|
|
|
RNA_pointer_create((ID *)ptr->id.data, &RNA_ImageUser, node->storage, &iuserptr);
|
2014-01-20 18:54:03 +01:00
|
|
|
uiLayoutSetContextPointer(layout, "image_user", &iuserptr);
|
2015-06-13 14:04:39 -03:00
|
|
|
uiTemplateImage(layout, C, ptr, "image", &iuserptr, 0, 1);
|
2012-09-25 10:14:07 +00:00
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
2010-01-06 00:09:07 +00:00
|
|
|
uiLayout *col, *row;
|
|
|
|
PointerRNA op_ptr;
|
|
|
|
PointerRNA scn_ptr;
|
|
|
|
PropertyRNA *prop;
|
|
|
|
const char *layer_name;
|
2012-05-27 19:38:10 +00:00
|
|
|
char scene_name[MAX_ID_NAME - 2];
|
2012-01-22 03:30:07 +00:00
|
|
|
wmOperatorType *ot = WM_operatortype_find("RENDER_OT_render", 1);
|
|
|
|
|
|
|
|
BLI_assert(ot != 0);
|
|
|
|
|
2010-08-04 12:18:07 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!node->id) return;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
row = uiLayoutRow(col, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "layer", 0, "", ICON_NONE);
|
2009-11-10 04:01:44 +00:00
|
|
|
|
2010-01-06 00:09:07 +00:00
|
|
|
prop = RNA_struct_find_property(ptr, "layer");
|
|
|
|
if (!(RNA_property_enum_identifier(C, ptr, prop, RNA_property_enum_get(ptr, prop), &layer_name)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
scn_ptr = RNA_pointer_get(ptr, "scene");
|
|
|
|
RNA_string_get(&scn_ptr, "name", scene_name);
|
|
|
|
|
2012-01-22 03:30:07 +00:00
|
|
|
WM_operator_properties_create_ptr(&op_ptr, ot);
|
2010-01-06 00:09:07 +00:00
|
|
|
RNA_string_set(&op_ptr, "layer", layer_name);
|
|
|
|
RNA_string_set(&op_ptr, "scene", scene_name);
|
2012-01-22 03:30:07 +00:00
|
|
|
uiItemFullO_ptr(row, ot, "", ICON_RENDER_STILL, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
|
2010-01-06 00:09:07 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-10 20:54:02 +00:00
|
|
|
uiLayout *col, *row;
|
2012-07-19 11:05:18 +00:00
|
|
|
int reference;
|
|
|
|
int filter;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-07-19 11:05:18 +00:00
|
|
|
filter = RNA_enum_get(ptr, "filter_type");
|
2012-08-14 12:39:12 +00:00
|
|
|
reference = RNA_boolean_get(ptr, "use_variable_size");
|
2012-07-19 11:05:18 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "filter_type", 0, "", ICON_NONE);
|
2012-07-19 11:05:18 +00:00
|
|
|
if (filter != R_FILTER_FAST_GAUSS) {
|
2012-08-14 12:39:12 +00:00
|
|
|
uiItemR(col, ptr, "use_variable_size", 0, NULL, ICON_NONE);
|
2012-07-19 11:05:18 +00:00
|
|
|
if (!reference) {
|
|
|
|
uiItemR(col, ptr, "use_bokeh", 0, NULL, ICON_NONE);
|
|
|
|
}
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_gamma_correction", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2009-09-21 16:21:54 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_relative", 0, NULL, ICON_NONE);
|
2011-02-10 20:54:02 +00:00
|
|
|
|
|
|
|
if (RNA_boolean_get(ptr, "use_relative")) {
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(col, IFACE_("Aspect Correction"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemR(row, ptr, "aspect_correction", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2011-02-10 20:54:02 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "factor_x", 0, IFACE_("X"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "factor_y", 0, IFACE_("Y"), ICON_NONE);
|
2011-02-10 20:54:02 +00:00
|
|
|
}
|
|
|
|
else {
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "size_x", 0, IFACE_("X"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "size_y", 0, IFACE_("Y"), ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_dblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-27 11:00:35 +00:00
|
|
|
uiLayout *col;
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "use_wrap", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Center:"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "center_x", 0, IFACE_("X"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "center_y", 0, IFACE_("Y"), ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
|
|
|
uiItemS(layout);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "distance", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "angle", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
|
|
|
uiItemS(layout);
|
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "spin", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "zoom", 0, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-18 21:04:54 +00:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "iterations", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "sigma_color", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "sigma_space", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2014-02-05 13:51:51 +01:00
|
|
|
static void node_composit_buts_defocus(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-18 21:04:54 +00:00
|
|
|
uiLayout *sub, *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Bokeh Type:"), ICON_NONE);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "bokeh", 0, "", ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "angle", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "use_gamma_correction", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer") == true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "f_stop", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "blur_max", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NONE);
|
2009-11-10 04:01:44 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_preview", 0, NULL, ICON_NONE);
|
2014-02-05 13:51:51 +01:00
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "scene", NULL, NULL, NULL);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_zbuffer", 0, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
sub = uiLayoutColumn(col, false);
|
|
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_zbuffer") == false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(sub, ptr, "z_scale", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* qdn: glare node */
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_glare(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-18 21:04:54 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "glare_type", 0, "", ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "quality", 0, "", ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "glare_type") != 1) {
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "glare_type") != 0)
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "color_modulation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "mix", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "glare_type") == 2) {
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "streaks", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "angle_offset", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
}
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "glare_type") == 0 || RNA_enum_get(ptr, "glare_type") == 2) {
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "glare_type") == 0)
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "use_rotate_45", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
}
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "glare_type") == 1) {
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "size", 0, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_tonemap(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-18 21:04:54 +00:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "tonemap_type", 0, "", ICON_NONE);
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "tonemap_type") == 0) {
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "key", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "offset", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "gamma", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2009-09-16 18:59:13 +00:00
|
|
|
else {
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "intensity", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "adaptation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "correction", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_lensdist(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-17 17:31:50 +00:00
|
|
|
uiLayout *col;
|
2009-09-17 15:06:03 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_projector", 0, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(col, false);
|
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector") == false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_jitter", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_fit", 0, NULL, ICON_NONE);
|
2009-09-18 21:04:54 +00:00
|
|
|
}
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_vecblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "samples", 0, NULL, ICON_NONE);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "factor", 0, IFACE_("Blur"), ICON_NONE);
|
2009-09-17 16:47:04 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Speed:"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "speed_min", 0, IFACE_("Min"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "speed_max", 0, IFACE_("Max"), ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "use_curved", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_filter(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "filter_type", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_flip(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "axis", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_crop(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-09-17 17:31:50 +00:00
|
|
|
uiLayout *col;
|
2011-04-21 13:11:51 +00:00
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "use_crop_size", 0, NULL, ICON_NONE);
|
2011-04-21 13:11:51 +00:00
|
|
|
uiItemR(layout, ptr, "relative", 0, NULL, ICON_NONE);
|
2010-08-25 02:18:37 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (RNA_boolean_get(ptr, "relative")) {
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "rel_min_x", 0, IFACE_("Left"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "rel_max_x", 0, IFACE_("Right"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "rel_min_y", 0, IFACE_("Up"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "rel_max_y", 0, IFACE_("Down"), ICON_NONE);
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "min_x", 0, IFACE_("Left"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "max_x", 0, IFACE_("Right"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "min_y", 0, IFACE_("Up"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "max_y", 0, IFACE_("Down"), ICON_NONE);
|
2011-04-21 13:11:51 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_splitviewer(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-09-18 21:04:54 +00:00
|
|
|
uiLayout *row, *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "factor", 0, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2012-01-10 19:08:08 +00:00
|
|
|
static void node_composit_buts_double_edge_mask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-01-10 19:08:08 +00:00
|
|
|
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Inner Edge:"), ICON_NONE);
|
2012-01-10 19:08:08 +00:00
|
|
|
uiItemR(col, ptr, "inner_mode", 0, "", ICON_NONE);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Buffer Edge:"), ICON_NONE);
|
2012-01-10 19:08:08 +00:00
|
|
|
uiItemR(col, ptr, "edge_mode", 0, "", ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-11-14 19:53:46 +00:00
|
|
|
static void node_composit_buts_map_range(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-11-14 19:53:46 +00:00
|
|
|
uiItemR(col, ptr, "use_clamp", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_map_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-19 19:57:30 +00:00
|
|
|
uiLayout *sub, *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "offset", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "size", 0, NULL, ICON_NONE);
|
2009-09-19 19:57:30 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_min", 0, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
sub = uiLayoutColumn(col, false);
|
2009-09-19 19:57:30 +00:00
|
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min"));
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(sub, ptr, "min", 0, "", ICON_NONE);
|
2009-09-19 19:57:30 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_max", 0, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
sub = uiLayoutColumn(col, false);
|
2009-09-19 19:57:30 +00:00
|
|
|
uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max"));
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(sub, ptr, "max", 0, "", ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_alphaover(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-19 19:57:30 +00:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_premultiply", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "premul", 0, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-11-12 14:59:01 +00:00
|
|
|
static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "use_alpha", 0, NULL, ICON_NONE);
|
2013-07-12 20:15:22 +00:00
|
|
|
uiItemR(col, ptr, "use_antialias_z", 0, NULL, ICON_NONE);
|
2010-11-12 14:59:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_hue_sat(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-19 19:57:30 +00:00
|
|
|
uiLayout *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_dilateerode(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2013-01-06 10:30:05 +00:00
|
|
|
uiItemR(layout, ptr, "mode", 0, NULL, ICON_NONE);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "distance", 0, NULL, ICON_NONE);
|
2013-01-06 10:30:05 +00:00
|
|
|
switch (RNA_enum_get(ptr, "mode")) {
|
2012-06-21 07:45:41 +00:00
|
|
|
case CMP_NODE_DILATEERODE_DISTANCE_THRESH:
|
|
|
|
uiItemR(layout, ptr, "edge", 0, NULL, ICON_NONE);
|
|
|
|
break;
|
|
|
|
case CMP_NODE_DILATEERODE_DISTANCE_FEATHER:
|
|
|
|
uiItemR(layout, ptr, "falloff", 0, NULL, ICON_NONE);
|
|
|
|
break;
|
2012-05-21 10:20:30 +00:00
|
|
|
}
|
2009-09-10 04:12:22 +00:00
|
|
|
}
|
|
|
|
|
2012-08-06 13:45:11 +00:00
|
|
|
static void node_composit_buts_inpaint(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "distance", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-08-23 06:48:01 +00:00
|
|
|
static void node_composit_buts_despeckle(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-08-23 06:48:01 +00:00
|
|
|
uiItemR(col, ptr, "threshold", 0, NULL, ICON_NONE);
|
2013-10-31 14:10:01 +00:00
|
|
|
uiItemR(col, ptr, "threshold_neighbor", 0, NULL, ICON_NONE);
|
2012-08-23 06:48:01 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_diff_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-10 04:12:22 +00:00
|
|
|
{
|
2009-09-20 13:34:54 +00:00
|
|
|
uiLayout *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_distance_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2012-04-29 20:07:29 +00:00
|
|
|
uiLayout *col, *row;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2013-02-04 00:18:09 +00:00
|
|
|
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(layout, IFACE_("Color Space:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-04-29 20:07:29 +00:00
|
|
|
uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_color_spill(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-20 13:34:54 +00:00
|
|
|
uiLayout *row, *col;
|
|
|
|
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(layout, IFACE_("Despill Channel:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2010-03-12 18:47:35 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE);
|
2010-03-12 18:47:35 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "limit_method") == 0) {
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Limiting Channel:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
}
|
2010-03-12 18:47:35 +00:00
|
|
|
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "use_unspill", 0, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
if (RNA_boolean_get(ptr, "use_unspill") == true) {
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
}
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-26 16:43:20 +00:00
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "tolerance", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "threshold", 0, NULL, ICON_NONE);
|
2009-09-26 16:43:20 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-04-21 15:53:30 +00:00
|
|
|
/*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE); Removed for now */
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2011-04-21 15:53:30 +00:00
|
|
|
/*uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, ICON_NONE); Removed for now*/
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_color_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-16 18:59:13 +00:00
|
|
|
{
|
2009-09-21 16:21:54 +00:00
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_channel_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-10-27 13:46:02 +00:00
|
|
|
{
|
|
|
|
uiLayout *col, *row;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(layout, IFACE_("Color Space:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "color_space", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Key Channel:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2009-11-10 04:01:44 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2010-03-13 14:47:26 +00:00
|
|
|
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE);
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "limit_method") == 0) {
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemL(col, IFACE_("Limiting Channel:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_luma_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-10 04:12:22 +00:00
|
|
|
{
|
2009-10-27 13:46:02 +00:00
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
2009-09-10 04:12:22 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_map_uv(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "alpha", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_id_mask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "index", 0, NULL, ICON_NONE);
|
2012-06-21 12:27:57 +00:00
|
|
|
uiItemR(layout, ptr, "use_antialiasing", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_file_output(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2012-03-01 07:56:15 +00:00
|
|
|
PointerRNA imfptr = RNA_pointer_get(ptr, "format");
|
2015-04-06 10:40:12 -03:00
|
|
|
const bool multilayer = RNA_enum_get(&imfptr, "file_format") == R_IMF_IMTYPE_MULTILAYER;
|
|
|
|
|
2012-03-01 07:56:15 +00:00
|
|
|
if (multilayer)
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(layout, IFACE_("Path:"), ICON_NONE);
|
2012-03-01 07:56:15 +00:00
|
|
|
else
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(layout, IFACE_("Base Path:"), ICON_NONE);
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
uiItemR(layout, ptr, "base_path", 0, "", ICON_NONE);
|
|
|
|
}
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_composit_buts_file_output_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
{
|
2015-04-06 10:40:12 -03:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2012-03-01 07:56:15 +00:00
|
|
|
PointerRNA imfptr = RNA_pointer_get(ptr, "format");
|
2012-05-02 07:18:51 +00:00
|
|
|
PointerRNA active_input_ptr, op_ptr;
|
2012-10-01 14:02:47 +00:00
|
|
|
uiLayout *row, *col;
|
2012-05-02 07:18:51 +00:00
|
|
|
int active_index;
|
2015-04-06 10:40:12 -03:00
|
|
|
const bool multilayer = RNA_enum_get(&imfptr, "file_format") == R_IMF_IMTYPE_MULTILAYER;
|
|
|
|
const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0;
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
|
2012-03-01 07:56:15 +00:00
|
|
|
node_composit_buts_file_output(layout, C, ptr);
|
2014-04-01 11:34:00 +11:00
|
|
|
uiTemplateImageSettings(layout, &imfptr, false);
|
2012-03-01 07:56:15 +00:00
|
|
|
|
2015-04-06 10:40:12 -03:00
|
|
|
/* disable stereo output for multilayer, too much work for something that no one will use */
|
|
|
|
/* if someone asks for that we can implement it */
|
|
|
|
if (is_multiview)
|
|
|
|
uiTemplateImageFormatViews(layout, &imfptr, NULL);
|
|
|
|
|
2012-03-01 07:56:15 +00:00
|
|
|
uiItemS(layout);
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemO(layout, IFACE_("Add Input"), ICON_ZOOMIN, "NODE_OT_output_file_add_socket");
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
|
|
|
col = uiLayoutColumn(row, true);
|
2012-10-01 14:02:47 +00:00
|
|
|
|
2012-05-02 07:18:51 +00:00
|
|
|
active_index = RNA_int_get(ptr, "active_input_index");
|
2012-05-11 08:06:01 +00:00
|
|
|
/* using different collection properties if multilayer format is enabled */
|
|
|
|
if (multilayer) {
|
2013-08-27 15:27:41 +00:00
|
|
|
uiTemplateList(col, C, "UI_UL_list", "file_output_node", ptr, "layer_slots", ptr, "active_input_index",
|
2015-02-11 00:06:03 +01:00
|
|
|
NULL, 0, 0, 0, 0);
|
2012-07-09 23:07:15 +00:00
|
|
|
RNA_property_collection_lookup_int(ptr, RNA_struct_find_property(ptr, "layer_slots"),
|
|
|
|
active_index, &active_input_ptr);
|
2012-05-11 08:06:01 +00:00
|
|
|
}
|
|
|
|
else {
|
2013-08-27 15:27:41 +00:00
|
|
|
uiTemplateList(col, C, "UI_UL_list", "file_output_node", ptr, "file_slots", ptr, "active_input_index",
|
2015-02-11 00:06:03 +01:00
|
|
|
NULL, 0, 0, 0, 0);
|
2012-07-09 23:07:15 +00:00
|
|
|
RNA_property_collection_lookup_int(ptr, RNA_struct_find_property(ptr, "file_slots"),
|
|
|
|
active_index, &active_input_ptr);
|
2012-05-11 08:06:01 +00:00
|
|
|
}
|
|
|
|
/* XXX collection lookup does not return the ID part of the pointer, setting this manually here */
|
|
|
|
active_input_ptr.id.data = ptr->id.data;
|
2012-05-02 07:18:51 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(row, true);
|
2012-10-01 14:02:47 +00:00
|
|
|
op_ptr = uiItemFullO(col, "NODE_OT_output_file_move_active_socket", "",
|
2012-07-09 23:07:15 +00:00
|
|
|
ICON_TRIA_UP, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS);
|
2012-05-02 07:18:51 +00:00
|
|
|
RNA_enum_set(&op_ptr, "direction", 1);
|
2012-10-01 14:02:47 +00:00
|
|
|
op_ptr = uiItemFullO(col, "NODE_OT_output_file_move_active_socket", "",
|
2012-07-09 23:07:15 +00:00
|
|
|
ICON_TRIA_DOWN, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS);
|
2012-05-02 07:18:51 +00:00
|
|
|
RNA_enum_set(&op_ptr, "direction", 2);
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
|
|
|
|
if (active_input_ptr.data) {
|
2012-05-11 08:06:01 +00:00
|
|
|
if (multilayer) {
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-05-11 08:06:01 +00:00
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(col, IFACE_("Layer:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemR(row, &active_input_ptr, "name", 0, "", ICON_NONE);
|
2012-07-09 23:07:15 +00:00
|
|
|
uiItemFullO(row, "NODE_OT_output_file_remove_active_socket", "",
|
|
|
|
ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY);
|
2012-05-11 08:06:01 +00:00
|
|
|
}
|
|
|
|
else {
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-05-11 08:06:01 +00:00
|
|
|
|
2013-11-21 10:45:52 +01:00
|
|
|
uiItemL(col, IFACE_("File Subpath:"), ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemR(row, &active_input_ptr, "path", 0, "", ICON_NONE);
|
2012-07-09 23:07:15 +00:00
|
|
|
uiItemFullO(row, "NODE_OT_output_file_remove_active_socket", "",
|
|
|
|
ICON_X, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_R_ICON_ONLY);
|
2012-05-11 08:06:01 +00:00
|
|
|
|
|
|
|
/* format details for individual files */
|
2012-03-01 07:56:15 +00:00
|
|
|
imfptr = RNA_pointer_get(&active_input_ptr, "format");
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(col, IFACE_("Format:"), ICON_NONE);
|
|
|
|
uiItemR(col, &active_input_ptr, "use_node_format", 0, NULL, ICON_NONE);
|
2012-03-01 07:56:15 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
|
|
|
uiLayoutSetActive(col, RNA_boolean_get(&active_input_ptr, "use_node_format") == false);
|
|
|
|
uiTemplateImageSettings(col, &imfptr, false);
|
2015-04-06 10:40:12 -03:00
|
|
|
|
|
|
|
if (is_multiview)
|
|
|
|
uiTemplateImageFormatViews(layout, &imfptr, NULL);
|
2012-03-01 07:56:15 +00:00
|
|
|
}
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_scale(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "space", 0, "", ICON_NONE);
|
2012-06-14 16:55:55 +00:00
|
|
|
|
|
|
|
if (RNA_enum_get(ptr, "space") == CMP_SCALE_RENDERPERCENT) {
|
2012-06-15 07:50:27 +00:00
|
|
|
uiLayout *row;
|
2012-06-14 16:55:55 +00:00
|
|
|
uiItemR(layout, ptr, "frame_method", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
2012-06-15 07:50:27 +00:00
|
|
|
uiItemR(row, ptr, "offset_x", 0, "X", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "offset_y", 0, "Y", ICON_NONE);
|
2012-06-14 16:55:55 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2010-03-15 22:36:39 +00:00
|
|
|
{
|
2011-04-21 15:53:30 +00:00
|
|
|
uiItemR(layout, ptr, "filter_type", 0, "", ICON_NONE);
|
2010-03-15 22:36:39 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_invert(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-09-20 13:34:54 +00:00
|
|
|
uiLayout *col;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, ptr, "invert_rgb", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "invert_alpha", 0, NULL, ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_premulkey(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "mapping", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_view_levels(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2009-09-10 04:12:22 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2009-09-10 04:12:22 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2010-01-20 04:19:55 +00:00
|
|
|
{
|
|
|
|
uiLayout *split, *col, *row;
|
|
|
|
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NONE);
|
2010-01-20 04:19:55 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "correction_method") == 0) {
|
2010-01-20 04:19:55 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
split = uiLayoutSplit(layout, 0.0f, false);
|
|
|
|
col = uiLayoutColumn(split, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, ptr, "lift", 1, 1, 0, 1);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "lift", 0, NULL, ICON_NONE);
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(split, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, ptr, "gamma", 1, 1, 1, 1);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "gamma", 0, NULL, ICON_NONE);
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(split, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, ptr, "gain", 1, 1, 1, 1);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "gain", 0, NULL, ICON_NONE);
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
split = uiLayoutSplit(layout, 0.0f, false);
|
|
|
|
col = uiLayoutColumn(split, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, ptr, "offset", 1, 1, 0, 1);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "offset", 0, NULL, ICON_NONE);
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(split, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, ptr, "power", 1, 1, 0, 1);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "power", 0, NULL, ICON_NONE);
|
2010-01-27 00:22:29 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(split, false);
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(col, ptr, "slope", 1, 1, 0, 1);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, ptr, "slope", 0, NULL, ICON_NONE);
|
2010-01-27 00:22:29 +00:00
|
|
|
}
|
2010-01-20 04:19:55 +00:00
|
|
|
|
|
|
|
}
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_composit_buts_colorbalance_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2011-07-04 18:48:36 +00:00
|
|
|
{
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NONE);
|
2011-07-04 18:48:36 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "correction_method") == 0) {
|
2011-07-04 18:48:36 +00:00
|
|
|
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(layout, ptr, "lift", 1, 1, 0, 1);
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "lift", 0, NULL, ICON_NONE);
|
2011-07-04 18:48:36 +00:00
|
|
|
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(layout, ptr, "gamma", 1, 1, 1, 1);
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "gamma", 0, NULL, ICON_NONE);
|
2011-07-04 18:48:36 +00:00
|
|
|
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(layout, ptr, "gain", 1, 1, 1, 1);
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "gain", 0, NULL, ICON_NONE);
|
2012-03-24 06:38:07 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(layout, ptr, "offset", 1, 1, 0, 1);
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "offset", 0, NULL, ICON_NONE);
|
2011-07-04 18:48:36 +00:00
|
|
|
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(layout, ptr, "power", 1, 1, 0, 1);
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "power", 0, NULL, ICON_NONE);
|
2011-07-04 18:48:36 +00:00
|
|
|
|
2012-11-09 11:03:53 +00:00
|
|
|
uiTemplateColorPicker(layout, ptr, "slope", 1, 1, 0, 1);
|
2011-07-04 19:22:37 +00:00
|
|
|
uiItemR(layout, ptr, "slope", 0, NULL, ICON_NONE);
|
|
|
|
}
|
2011-07-04 18:48:36 +00:00
|
|
|
}
|
|
|
|
|
2010-01-20 04:19:55 +00:00
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_composit_buts_huecorrect(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2010-01-21 00:00:45 +00:00
|
|
|
{
|
2012-06-21 14:37:56 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2014-06-30 16:20:02 +02:00
|
|
|
uiTemplateCurveMapping(layout, ptr, "mapping", 'h', false, false, false);
|
2010-01-21 00:00:45 +00:00
|
|
|
}
|
|
|
|
|
2010-12-13 21:17:00 +00:00
|
|
|
static void node_composit_buts_ycc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "mode", 0, "", ICON_NONE);
|
2010-12-13 21:17:00 +00:00
|
|
|
}
|
|
|
|
|
2011-11-07 12:56:05 +00:00
|
|
|
static void node_composit_buts_movieclip(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
|
|
|
|
}
|
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_composit_buts_movieclip_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2012-09-25 10:14:07 +00:00
|
|
|
{
|
|
|
|
bNode *node = ptr->data;
|
|
|
|
PointerRNA clipptr;
|
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
|
|
|
|
|
|
|
|
if (!node->id)
|
|
|
|
return;
|
|
|
|
|
|
|
|
clipptr = RNA_pointer_get(ptr, "clip");
|
|
|
|
|
|
|
|
uiTemplateColorspaceSettings(layout, &clipptr, "colorspace_settings");
|
|
|
|
}
|
|
|
|
|
2011-11-07 12:56:05 +00:00
|
|
|
static void node_composit_buts_stabilize2d(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
2011-11-07 12:56:05 +00:00
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!node->id)
|
2011-11-07 12:56:05 +00:00
|
|
|
return;
|
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemR(layout, ptr, "filter_type", 0, "", ICON_NONE);
|
2011-11-07 12:56:05 +00:00
|
|
|
}
|
|
|
|
|
2013-01-31 15:08:37 +00:00
|
|
|
static void node_composit_buts_translate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2013-02-04 16:12:42 +00:00
|
|
|
uiItemR(layout, ptr, "use_relative", 0, NULL, ICON_NONE);
|
2013-01-31 15:08:37 +00:00
|
|
|
uiItemR(layout, ptr, "wrap_axis", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2011-11-07 12:56:05 +00:00
|
|
|
static void node_composit_buts_transform(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemR(layout, ptr, "filter_type", 0, "", ICON_NONE);
|
2011-11-07 12:56:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void node_composit_buts_moviedistortion(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
2011-11-07 12:56:05 +00:00
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!node->id)
|
2011-11-07 12:56:05 +00:00
|
|
|
return;
|
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemR(layout, ptr, "distortion_type", 0, "", ICON_NONE);
|
2011-11-07 12:56:05 +00:00
|
|
|
}
|
|
|
|
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
static void node_composit_buts_colorcorrection(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *row;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "red", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "green", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "blue", 0, NULL, ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, "", ICON_NONE);
|
|
|
|
uiItemL(row, IFACE_("Saturation"), ICON_NONE);
|
|
|
|
uiItemL(row, IFACE_("Contrast"), ICON_NONE);
|
|
|
|
uiItemL(row, IFACE_("Gamma"), ICON_NONE);
|
|
|
|
uiItemL(row, IFACE_("Gain"), ICON_NONE);
|
|
|
|
uiItemL(row, IFACE_("Lift"), ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Master"), ICON_NONE);
|
2012-05-21 20:10:21 +00:00
|
|
|
uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "master_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "master_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "master_gain", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Highlights"), ICON_NONE);
|
2012-05-21 20:10:21 +00:00
|
|
|
uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_gain", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Midtones"), ICON_NONE);
|
2012-05-21 20:10:21 +00:00
|
|
|
uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_gain", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Shadows"), ICON_NONE);
|
2012-05-21 20:10:21 +00:00
|
|
|
uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_gamma", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_gain", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_lift", UI_ITEM_R_SLIDER, "", ICON_NONE);
|
2012-05-21 18:47:55 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2012-05-21 18:47:55 +00:00
|
|
|
uiItemR(row, ptr, "midtones_start", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
}
|
2012-05-21 20:10:21 +00:00
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_composit_buts_colorcorrection_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2012-05-27 00:36:50 +00:00
|
|
|
{
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiLayout *row;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "red", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "green", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "blue", 0, NULL, ICON_NONE);
|
|
|
|
row = layout;
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Saturation"), ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Contrast"), ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "master_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Gamma"), ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "master_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Gain"), ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "master_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
2012-09-04 18:47:08 +00:00
|
|
|
uiItemL(row, IFACE_("Lift"), ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "shadows_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "midtones_start", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "midtones_end", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_composit_buts_switch(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "check", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2015-04-06 10:40:12 -03:00
|
|
|
static void node_composit_buts_switch_view_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *UNUSED(ptr))
|
|
|
|
{
|
|
|
|
PointerRNA op_ptr;
|
|
|
|
wmOperatorType *ot = WM_operatortype_find("NODE_OT_switch_view_update", 1);
|
|
|
|
|
|
|
|
BLI_assert(ot != 0);
|
|
|
|
|
|
|
|
WM_operator_properties_create_ptr(&op_ptr, ot);
|
|
|
|
|
|
|
|
uiItemFullO_ptr(layout, ot, "Update Views", ICON_FILE_REFRESH, op_ptr.data, WM_OP_INVOKE_DEFAULT, 0);
|
|
|
|
}
|
|
|
|
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
static void node_composit_buts_boxmask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *row;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
2012-05-21 19:58:23 +00:00
|
|
|
uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
|
|
|
uiItemR(layout, ptr, "rotation", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "mask_type", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_composit_buts_bokehimage(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "flaps", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "angle", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "rounding", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "catadioptric", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "shift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-08-14 14:31:39 +00:00
|
|
|
static void node_composit_buts_bokehblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "use_variable_size", 0, NULL, ICON_NONE);
|
|
|
|
// uiItemR(layout, ptr, "f_stop", 0, NULL, ICON_NONE); // UNUSED
|
|
|
|
uiItemR(layout, ptr, "blur_max", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-09-15 01:52:28 +00:00
|
|
|
static void node_composit_backdrop_viewer(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
{
|
|
|
|
// node_composit_backdrop_canvas(snode, backdrop, node, x, y);
|
2012-06-08 09:17:07 +00:00
|
|
|
if (node->custom1 == 0) {
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
const float backdropWidth = backdrop->x;
|
|
|
|
const float backdropHeight = backdrop->y;
|
2012-05-27 19:38:10 +00:00
|
|
|
const float cx = x + snode->zoom * backdropWidth * node->custom3;
|
|
|
|
const float cy = y + snode->zoom * backdropHeight * node->custom4;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
|
|
|
glColor3f(1.0, 1.0, 1.0);
|
|
|
|
|
|
|
|
glBegin(GL_LINES);
|
2012-05-27 19:38:10 +00:00
|
|
|
glVertex2f(cx - 25, cy - 25);
|
|
|
|
glVertex2f(cx + 25, cy + 25);
|
|
|
|
glVertex2f(cx + 25, cy - 25);
|
|
|
|
glVertex2f(cx - 25, cy + 25);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-15 01:52:28 +00:00
|
|
|
static void node_composit_backdrop_boxmask(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
{
|
2012-05-22 21:16:59 +00:00
|
|
|
NodeBoxMask *boxmask = node->storage;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
const float backdropWidth = backdrop->x;
|
|
|
|
const float backdropHeight = backdrop->y;
|
2012-05-27 19:38:10 +00:00
|
|
|
const float aspect = backdropWidth / backdropHeight;
|
Cleanup: Internal degrees removal.
This patch changes most of the reamining degrees usage in internal code into radians.
I let a few which I know off asside, for reasons explained below - and I'm not sure to have found out all of them.
WARNING: this introduces forward incompatibility, which means files saved from this version won't open 100% correctly
in previous versions (a few angle properties would use radians values as degrees...).
Details:
- Data:
-- Lamp.spotsize: Game engine exposed this setting in degrees, to not break the API here I kept it as such
(using getter/setter functions), still using radians internally.
-- Mesh.smoothresh: Didn't touch to this one, as we will hopefully replace it completely by loop normals currently in dev.
- Modifiers:
-- EdgeSplitModifierData.split_angle, BevelModifierData.bevel_angle: Done.
- Postprocessing:
-- WipeVars.angle (sequencer's effect), NodeBokehImage.angle, NodeBoxMask.rotation, NodeEllipseMask.rotation: Done.
- BGE:
-- bConstraintActuator: Orientation type done (the minloc[0] & maxloc[0] cases). Did not touch to 'limit location' type,
it can also limit rotation, but it exposes through RNA the same limit_min/limit_max, which hence
can be either distance or angle values, depending on the mode. Will leave this to BGE team.
-- bSoundActuator.cone_outer_angle_3d, bSoundActuator.cone_inner_angle_3d: Done (note I kept degrees in BGE itself,
as it seems this is the expected value here...).
-- bRadarSensor.angle: Done.
Reviewers: brecht, campbellbarton, sergey, gaiaclary, dfelinto, moguri, jbakker, lukastoenne, howardt
Reviewed By: brecht, campbellbarton, sergey, gaiaclary, moguri, jbakker, lukastoenne, howardt
Thanks to all!
Differential Revision: http://developer.blender.org/D59
2013-12-03 20:09:25 +01:00
|
|
|
const float rad = -boxmask->rotation;
|
2012-05-22 21:16:59 +00:00
|
|
|
const float cosine = cosf(rad);
|
|
|
|
const float sine = sinf(rad);
|
|
|
|
const float halveBoxWidth = backdropWidth * (boxmask->width / 2.0f);
|
|
|
|
const float halveBoxHeight = backdropHeight * (boxmask->height / 2.0f) * aspect;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
|
|
|
float cx, cy, x1, x2, x3, x4;
|
|
|
|
float y1, y2, y3, y4;
|
|
|
|
|
|
|
|
|
|
|
|
glColor3f(1.0, 1.0, 1.0);
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
cx = x + snode->zoom * backdropWidth * boxmask->x;
|
|
|
|
cy = y + snode->zoom * backdropHeight * boxmask->y;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
x1 = cx - (cosine * halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
|
|
|
|
x2 = cx - (cosine * -halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
|
|
|
|
x3 = cx - (cosine * -halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
|
|
|
|
x4 = cx - (cosine * halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
|
|
|
|
y1 = cy - (-sine * halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
|
|
|
|
y2 = cy - (-sine * -halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
|
|
|
|
y3 = cy - (-sine * -halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
|
|
|
|
y4 = cy - (-sine * halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
|
|
|
glBegin(GL_LINE_LOOP);
|
|
|
|
glVertex2f(x1, y1);
|
|
|
|
glVertex2f(x2, y2);
|
|
|
|
glVertex2f(x3, y3);
|
|
|
|
glVertex2f(x4, y4);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2012-09-15 01:52:28 +00:00
|
|
|
static void node_composit_backdrop_ellipsemask(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
NodeEllipseMask *ellipsemask = node->storage;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
const float backdropWidth = backdrop->x;
|
|
|
|
const float backdropHeight = backdrop->y;
|
2012-05-22 21:16:59 +00:00
|
|
|
const float aspect = backdropWidth / backdropHeight;
|
Cleanup: Internal degrees removal.
This patch changes most of the reamining degrees usage in internal code into radians.
I let a few which I know off asside, for reasons explained below - and I'm not sure to have found out all of them.
WARNING: this introduces forward incompatibility, which means files saved from this version won't open 100% correctly
in previous versions (a few angle properties would use radians values as degrees...).
Details:
- Data:
-- Lamp.spotsize: Game engine exposed this setting in degrees, to not break the API here I kept it as such
(using getter/setter functions), still using radians internally.
-- Mesh.smoothresh: Didn't touch to this one, as we will hopefully replace it completely by loop normals currently in dev.
- Modifiers:
-- EdgeSplitModifierData.split_angle, BevelModifierData.bevel_angle: Done.
- Postprocessing:
-- WipeVars.angle (sequencer's effect), NodeBokehImage.angle, NodeBoxMask.rotation, NodeEllipseMask.rotation: Done.
- BGE:
-- bConstraintActuator: Orientation type done (the minloc[0] & maxloc[0] cases). Did not touch to 'limit location' type,
it can also limit rotation, but it exposes through RNA the same limit_min/limit_max, which hence
can be either distance or angle values, depending on the mode. Will leave this to BGE team.
-- bSoundActuator.cone_outer_angle_3d, bSoundActuator.cone_inner_angle_3d: Done (note I kept degrees in BGE itself,
as it seems this is the expected value here...).
-- bRadarSensor.angle: Done.
Reviewers: brecht, campbellbarton, sergey, gaiaclary, dfelinto, moguri, jbakker, lukastoenne, howardt
Reviewed By: brecht, campbellbarton, sergey, gaiaclary, moguri, jbakker, lukastoenne, howardt
Thanks to all!
Differential Revision: http://developer.blender.org/D59
2013-12-03 20:09:25 +01:00
|
|
|
const float rad = -ellipsemask->rotation;
|
2012-05-22 21:16:59 +00:00
|
|
|
const float cosine = cosf(rad);
|
|
|
|
const float sine = sinf(rad);
|
|
|
|
const float halveBoxWidth = backdropWidth * (ellipsemask->width / 2.0f);
|
|
|
|
const float halveBoxHeight = backdropHeight * (ellipsemask->height / 2.0f) * aspect;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
|
|
|
float cx, cy, x1, x2, x3, x4;
|
|
|
|
float y1, y2, y3, y4;
|
|
|
|
|
|
|
|
|
|
|
|
glColor3f(1.0, 1.0, 1.0);
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
cx = x + snode->zoom * backdropWidth * ellipsemask->x;
|
|
|
|
cy = y + snode->zoom * backdropHeight * ellipsemask->y;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
x1 = cx - (cosine * halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
|
|
|
|
x2 = cx - (cosine * -halveBoxWidth + sine * halveBoxHeight) * snode->zoom;
|
|
|
|
x3 = cx - (cosine * -halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
|
|
|
|
x4 = cx - (cosine * halveBoxWidth + sine * -halveBoxHeight) * snode->zoom;
|
|
|
|
y1 = cy - (-sine * halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
|
|
|
|
y2 = cy - (-sine * -halveBoxWidth + cosine * halveBoxHeight) * snode->zoom;
|
|
|
|
y3 = cy - (-sine * -halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
|
|
|
|
y4 = cy - (-sine * halveBoxWidth + cosine * -halveBoxHeight) * snode->zoom;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
|
|
|
|
glBegin(GL_LINE_LOOP);
|
|
|
|
|
|
|
|
glVertex2f(x1, y1);
|
|
|
|
glVertex2f(x2, y2);
|
|
|
|
glVertex2f(x3, y3);
|
|
|
|
glVertex2f(x4, y4);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_composit_buts_ellipsemask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiLayout *row;
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
2012-05-21 19:58:23 +00:00
|
|
|
uiItemR(row, ptr, "x", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "y", 0, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, true);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(row, ptr, "width", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
uiItemR(row, ptr, "height", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
|
|
|
|
uiItemR(layout, ptr, "rotation", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "mask_type", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2013-02-10 12:20:10 +00:00
|
|
|
static void node_composit_buts_composite(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2013-02-10 13:14:51 +00:00
|
|
|
uiItemR(layout, ptr, "use_alpha", 0, NULL, ICON_NONE);
|
2013-02-10 12:20:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void node_composit_buts_viewer(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2013-02-10 13:14:51 +00:00
|
|
|
uiItemR(layout, ptr, "use_alpha", 0, NULL, ICON_NONE);
|
2013-02-10 12:20:10 +00:00
|
|
|
}
|
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_composit_buts_viewer_ex(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
{
|
|
|
|
uiLayout *col;
|
|
|
|
|
2013-02-13 04:04:14 +00:00
|
|
|
uiItemR(layout, ptr, "use_alpha", 0, NULL, ICON_NONE);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(layout, ptr, "tile_order", 0, NULL, ICON_NONE);
|
2012-05-27 19:38:10 +00:00
|
|
|
if (RNA_enum_get(ptr, "tile_order") == 0) {
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
uiItemR(col, ptr, "center_x", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "center_y", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-04 16:42:58 +00:00
|
|
|
static void node_composit_buts_mask(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-07-27 09:32:47 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
|
2012-06-04 16:42:58 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "mask", NULL, NULL, NULL);
|
2012-06-21 12:27:57 +00:00
|
|
|
uiItemR(layout, ptr, "use_antialiasing", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "use_feather", 0, NULL, ICON_NONE);
|
2012-06-13 19:57:23 +00:00
|
|
|
|
2012-07-26 13:29:38 +00:00
|
|
|
uiItemR(layout, ptr, "size_source", 0, "", ICON_NONE);
|
|
|
|
|
2012-07-27 09:32:47 +00:00
|
|
|
if (node->custom1 & (CMP_NODEFLAG_MASK_FIXED | CMP_NODEFLAG_MASK_FIXED_SCENE)) {
|
|
|
|
uiItemR(layout, ptr, "size_x", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "size_y", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
|
|
|
uiItemR(layout, ptr, "use_motion_blur", 0, NULL, ICON_NONE);
|
|
|
|
if (node->custom1 & CMP_NODEFLAG_MASK_MOTION_BLUR) {
|
|
|
|
uiItemR(layout, ptr, "motion_blur_samples", 0, NULL, ICON_NONE);
|
2012-07-27 10:20:36 +00:00
|
|
|
uiItemR(layout, ptr, "motion_blur_shutter", 0, NULL, ICON_NONE);
|
2012-07-26 13:29:38 +00:00
|
|
|
}
|
2012-06-04 16:42:58 +00:00
|
|
|
}
|
|
|
|
|
2012-06-14 12:18:42 +00:00
|
|
|
static void node_composit_buts_keyingscreen(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-07-09 23:07:15 +00:00
|
|
|
bNode *node = ptr->data;
|
2012-06-14 12:18:42 +00:00
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, NULL, NULL);
|
|
|
|
|
|
|
|
if (node->id) {
|
|
|
|
MovieClip *clip = (MovieClip *) node->id;
|
|
|
|
uiLayout *col;
|
|
|
|
PointerRNA tracking_ptr;
|
|
|
|
|
|
|
|
RNA_pointer_create(&clip->id, &RNA_MovieTracking, &clip->tracking, &tracking_ptr);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-14 12:18:42 +00:00
|
|
|
uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-29 14:00:47 +00:00
|
|
|
static void node_composit_buts_keying(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
2012-10-26 04:14:10 +00:00
|
|
|
/* bNode *node = ptr->data; */ /* UNUSED */
|
2012-05-29 14:00:47 +00:00
|
|
|
|
|
|
|
uiItemR(layout, ptr, "blur_pre", 0, NULL, ICON_NONE);
|
2012-06-10 17:41:04 +00:00
|
|
|
uiItemR(layout, ptr, "screen_balance", 0, NULL, ICON_NONE);
|
2012-05-29 14:55:01 +00:00
|
|
|
uiItemR(layout, ptr, "despill_factor", 0, NULL, ICON_NONE);
|
2012-07-10 14:53:36 +00:00
|
|
|
uiItemR(layout, ptr, "despill_balance", 0, NULL, ICON_NONE);
|
2012-06-14 12:19:13 +00:00
|
|
|
uiItemR(layout, ptr, "edge_kernel_radius", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "edge_kernel_tolerance", 0, NULL, ICON_NONE);
|
2012-05-29 14:00:47 +00:00
|
|
|
uiItemR(layout, ptr, "clip_black", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "clip_white", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "dilate_distance", 0, NULL, ICON_NONE);
|
2012-06-25 10:50:24 +00:00
|
|
|
uiItemR(layout, ptr, "feather_falloff", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "feather_distance", 0, NULL, ICON_NONE);
|
2012-05-29 14:00:47 +00:00
|
|
|
uiItemR(layout, ptr, "blur_post", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2012-06-19 17:29:58 +00:00
|
|
|
static void node_composit_buts_trackpos(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
2012-08-04 12:54:27 +00:00
|
|
|
bNode *node = ptr->data;
|
2012-06-19 17:29:58 +00:00
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
|
|
|
|
|
|
|
|
if (node->id) {
|
|
|
|
MovieClip *clip = (MovieClip *) node->id;
|
|
|
|
MovieTracking *tracking = &clip->tracking;
|
|
|
|
MovieTrackingObject *object;
|
|
|
|
uiLayout *col;
|
|
|
|
PointerRNA tracking_ptr;
|
|
|
|
NodeTrackPosData *data = node->storage;
|
|
|
|
|
|
|
|
RNA_pointer_create(&clip->id, &RNA_MovieTracking, tracking, &tracking_ptr);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-06-19 17:29:58 +00:00
|
|
|
uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA);
|
|
|
|
|
|
|
|
object = BKE_tracking_object_get_named(tracking, data->tracking_object);
|
|
|
|
if (object) {
|
|
|
|
PointerRNA object_ptr;
|
|
|
|
|
|
|
|
RNA_pointer_create(&clip->id, &RNA_MovieTrackingObject, object, &object_ptr);
|
|
|
|
|
|
|
|
uiItemPointerR(col, ptr, "track_name", &object_ptr, "tracks", "", ICON_ANIM_DATA);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
uiItemR(layout, ptr, "track_name", 0, "", ICON_ANIM_DATA);
|
|
|
|
}
|
2012-07-10 11:01:25 +00:00
|
|
|
|
2012-07-27 11:07:12 +00:00
|
|
|
uiItemR(layout, ptr, "position", 0, NULL, ICON_NONE);
|
|
|
|
|
2013-06-12 14:28:36 +00:00
|
|
|
if (ELEM(node->custom1, CMP_TRACKPOS_RELATIVE_FRAME, CMP_TRACKPOS_ABSOLUTE_FRAME)) {
|
2012-09-20 12:16:00 +00:00
|
|
|
uiItemR(layout, ptr, "frame_relative", 0, NULL, ICON_NONE);
|
2012-07-27 11:07:12 +00:00
|
|
|
}
|
2012-06-19 17:29:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
static void node_composit_buts_planetrackdeform(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
bNode *node = ptr->data;
|
2015-02-04 01:16:28 +05:00
|
|
|
NodePlaneTrackDeformData *data = node->storage;
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
|
|
|
|
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
|
|
|
|
|
|
|
|
if (node->id) {
|
|
|
|
MovieClip *clip = (MovieClip *) node->id;
|
|
|
|
MovieTracking *tracking = &clip->tracking;
|
|
|
|
MovieTrackingObject *object;
|
|
|
|
uiLayout *col;
|
|
|
|
PointerRNA tracking_ptr;
|
|
|
|
NodeTrackPosData *data = node->storage;
|
|
|
|
|
|
|
|
RNA_pointer_create(&clip->id, &RNA_MovieTracking, tracking, &tracking_ptr);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA);
|
|
|
|
|
|
|
|
object = BKE_tracking_object_get_named(tracking, data->tracking_object);
|
|
|
|
if (object) {
|
|
|
|
PointerRNA object_ptr;
|
|
|
|
|
|
|
|
RNA_pointer_create(&clip->id, &RNA_MovieTrackingObject, object, &object_ptr);
|
|
|
|
|
|
|
|
uiItemPointerR(col, ptr, "plane_track_name", &object_ptr, "plane_tracks", "", ICON_ANIM_DATA);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
uiItemR(layout, ptr, "plane_track_name", 0, "", ICON_ANIM_DATA);
|
|
|
|
}
|
|
|
|
}
|
2015-02-04 01:16:28 +05:00
|
|
|
|
|
|
|
uiItemR(layout, ptr, "use_motion_blur", 0, NULL, ICON_NONE);
|
|
|
|
if (data->flag & CMP_NODEFLAG_PLANETRACKDEFORM_MOTION_BLUR) {
|
|
|
|
uiItemR(layout, ptr, "motion_blur_samples", 0, NULL, ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "motion_blur_shutter", 0, NULL, ICON_NONE);
|
|
|
|
}
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
}
|
|
|
|
|
2014-03-11 14:07:49 +01:00
|
|
|
static void node_composit_buts_cornerpin(uiLayout *UNUSED(layout), bContext *UNUSED(C), PointerRNA *UNUSED(ptr))
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-07-26 12:59:29 +02:00
|
|
|
static void node_composit_buts_sunbeams(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
uiItemR(layout, ptr, "source", UI_ITEM_R_EXPAND, "", ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "ray_length", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* only once called */
|
|
|
|
static void node_composit_set_butfunc(bNodeType *ntype)
|
|
|
|
{
|
2012-04-28 06:31:57 +00:00
|
|
|
switch (ntype->type) {
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_IMAGE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_image;
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_image_ex;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_R_LAYERS:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_renderlayers;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_NORMAL:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_normal;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_CURVE_VEC:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_curvevec;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_CURVE_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_curvecol;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_VALUE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_value;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_rgb;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_FLIP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_flip;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_SPLITVIEWER:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_splitviewer;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_MIX_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_mix_rgb;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_VALTORGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_colorramp;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_CROP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_crop;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_BLUR:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_blur;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_DBLUR:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_dblur;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_BILATERALBLUR:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_bilateralblur;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_DEFOCUS:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_defocus;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_GLARE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_glare;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_TONEMAP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_tonemap;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_LENSDIST:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_lensdist;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_VECBLUR:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_vecblur;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_FILTER:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_filter;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_MAP_VALUE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_map_value;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2012-11-14 19:53:46 +00:00
|
|
|
case CMP_NODE_MAP_RANGE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_map_range;
|
2012-11-14 19:53:46 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_TIME:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_time;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_ALPHAOVER:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_alphaover;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_HUE_SAT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_hue_sat;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_TEXTURE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_texture;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_DILATEERODE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_dilateerode;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2012-08-06 13:45:11 +00:00
|
|
|
case CMP_NODE_INPAINT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_inpaint;
|
2012-08-06 13:45:11 +00:00
|
|
|
break;
|
2012-08-23 06:48:01 +00:00
|
|
|
case CMP_NODE_DESPECKLE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_despeckle;
|
2012-08-23 06:48:01 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_OUTPUT_FILE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_file_output;
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_file_output_ex;
|
Adds a new node type for saving multiple image files from a single node.
Unlike the existing file output node this node has an arbitrary number of
possible input slots. It has a base path string that can be set to a general
base folder. Every input socket then uses its name as an extension of the base
path for file organization. This can include further subfolders on top of the
base path. Example:
Base path: '/home/user/myproject'
Input 1: 'Compo'
Input 2: 'Diffuse/'
Input 3: 'details/Normals'
would create output files
in /home/user/myproject: Compo0001.png, Compo0002.png, ...
in /home/user/myproject/Diffuse: 0001.png, 0002.png, ... (no filename base
given)
in /home/user/myproject/details: Normals0001.png, Normals0002.png, ...
Most settings for the node can be found in the sidebar (NKEY). New input sockets
can be added with the "Add Input" button. There is a list of input sockets and
below that the details for each socket can be changed, including the sub-path
and filename. Sockets can be removed here as well. By default each socket uses
the render settings file output format, but each can use its own format if
necessary.
To my knowledge this is the first node making use of such dynamic sockets in
trunk. So this is also a design test, other nodes might use this in the future.
Adding operator buttons on top of a node is a bit unwieldy atm, because all node
operators generally work on selected and/or active node(s). The operator button
would therefore either have to make sure the node is activated before the
operator is called (block callback maybe?) OR it has to store the node name
(risky, weak reference). For now it is only used in the sidebar, where only the
active node's buttons are displayed.
Also adds a new struct_type value to bNodeSocket, in order to distinguish
different socket types with the same data type (file inputs are SOCK_RGBA color
sockets). Would be nicer to use data type only for actual data evaluation, but
used in too many places, this works ok for now.
2012-02-22 12:24:04 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_DIFF_MATTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_diff_matte;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2009-09-10 04:12:22 +00:00
|
|
|
case CMP_NODE_DIST_MATTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_distance_matte;
|
2009-09-10 04:12:22 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_COLOR_SPILL:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_color_spill;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2009-09-10 04:12:22 +00:00
|
|
|
case CMP_NODE_CHROMA_MATTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_chroma_matte;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2009-09-10 04:12:22 +00:00
|
|
|
case CMP_NODE_COLOR_MATTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_color_matte;
|
2009-09-10 04:12:22 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_SCALE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_scale;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2011-04-21 15:53:30 +00:00
|
|
|
case CMP_NODE_ROTATE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_rotate;
|
2011-04-21 15:53:30 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_CHANNEL_MATTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_channel_matte;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_LUMA_MATTE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_luma_matte;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_MAP_UV:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_map_uv;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_ID_MASK:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_id_mask;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2012-01-10 19:08:08 +00:00
|
|
|
case CMP_NODE_DOUBLEEDGEMASK:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_double_edge_mask;
|
2012-01-10 19:08:08 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
case CMP_NODE_MATH:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_math;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_INVERT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_invert;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_PREMULKEY:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_premulkey;
|
2008-12-24 10:33:10 +00:00
|
|
|
break;
|
2010-01-20 04:19:55 +00:00
|
|
|
case CMP_NODE_VIEW_LEVELS:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_view_levels;
|
2011-04-21 15:53:30 +00:00
|
|
|
break;
|
2010-01-20 04:19:55 +00:00
|
|
|
case CMP_NODE_COLORBALANCE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_colorbalance;
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_colorbalance_ex;
|
2011-07-04 19:22:37 +00:00
|
|
|
break;
|
2010-01-21 00:00:45 +00:00
|
|
|
case CMP_NODE_HUECORRECT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_huecorrect;
|
2011-04-21 15:53:30 +00:00
|
|
|
break;
|
2010-11-12 14:59:01 +00:00
|
|
|
case CMP_NODE_ZCOMBINE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_zcombine;
|
2011-04-21 15:53:30 +00:00
|
|
|
break;
|
2010-12-13 21:17:00 +00:00
|
|
|
case CMP_NODE_COMBYCCA:
|
|
|
|
case CMP_NODE_SEPYCCA:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_ycc;
|
2010-12-13 21:17:00 +00:00
|
|
|
break;
|
2011-11-07 12:56:05 +00:00
|
|
|
case CMP_NODE_MOVIECLIP:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_movieclip;
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_movieclip_ex;
|
2011-11-07 12:56:05 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_STABILIZE2D:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_stabilize2d;
|
2011-11-07 12:56:05 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_TRANSFORM:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_transform;
|
2011-11-07 12:56:05 +00:00
|
|
|
break;
|
2013-01-31 15:08:37 +00:00
|
|
|
case CMP_NODE_TRANSLATE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_translate;
|
2013-01-31 15:08:37 +00:00
|
|
|
break;
|
2011-11-07 12:56:05 +00:00
|
|
|
case CMP_NODE_MOVIEDISTORTION:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_moviedistortion;
|
2011-11-07 12:56:05 +00:00
|
|
|
break;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
case CMP_NODE_COLORCORRECTION:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_colorcorrection;
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_colorcorrection_ex;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_SWITCH:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_switch;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
break;
|
2015-04-06 10:40:12 -03:00
|
|
|
case CMP_NODE_SWITCH_VIEW:
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_switch_view_ex;
|
|
|
|
break;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
case CMP_NODE_MASK_BOX:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_boxmask;
|
|
|
|
ntype->draw_backdrop = node_composit_backdrop_boxmask;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_MASK_ELLIPSE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_ellipsemask;
|
|
|
|
ntype->draw_backdrop = node_composit_backdrop_ellipsemask;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
break;
|
|
|
|
case CMP_NODE_BOKEHIMAGE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_bokehimage;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
break;
|
2012-08-14 14:31:39 +00:00
|
|
|
case CMP_NODE_BOKEHBLUR:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_bokehblur;
|
2012-08-14 14:31:39 +00:00
|
|
|
break;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
case CMP_NODE_VIEWER:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_viewer;
|
|
|
|
ntype->draw_buttons_ex = node_composit_buts_viewer_ex;
|
|
|
|
ntype->draw_backdrop = node_composit_backdrop_viewer;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
break;
|
2013-02-10 12:20:10 +00:00
|
|
|
case CMP_NODE_COMPOSITE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_composite;
|
2013-02-10 12:20:10 +00:00
|
|
|
break;
|
2012-06-04 16:42:58 +00:00
|
|
|
case CMP_NODE_MASK:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_mask;
|
2012-06-04 16:42:58 +00:00
|
|
|
break;
|
2012-06-14 12:18:42 +00:00
|
|
|
case CMP_NODE_KEYINGSCREEN:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_keyingscreen;
|
2012-06-14 12:18:42 +00:00
|
|
|
break;
|
2012-05-29 14:00:47 +00:00
|
|
|
case CMP_NODE_KEYING:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_keying;
|
2012-05-29 14:00:47 +00:00
|
|
|
break;
|
2012-06-19 17:29:58 +00:00
|
|
|
case CMP_NODE_TRACKPOS:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_trackpos;
|
2012-06-19 17:29:58 +00:00
|
|
|
break;
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
case CMP_NODE_PLANETRACKDEFORM:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_composit_buts_planetrackdeform;
|
Merge plane track feature from tomato branch
This commit includes all the changes made for plane tracker
in tomato branch.
Movie clip editor changes:
- Artist might create a plane track out of multiple point
tracks which belongs to the same track (minimum amount of
point tracks is 4, maximum is not actually limited).
When new plane track is added, it's getting "tracked"
across all point tracks, which makes it stick to the same
plane point tracks belong to.
- After plane track was added, it need to be manually adjusted
in a way it covers feature one might to mask/replace.
General transform tools (G, R, S) or sliding corners with
a mouse could be sued for this. Plane corner which
corresponds to left bottom image corner has got X/Y axis
on it (red is for X axis, green for Y).
- Re-adjusting plane corners makes plane to be "re-tracked"
for the frames sequence between current frame and next
and previous keyframes.
- Kayframes might be removed from the plane, using Shit-X
(Marker Delete) operator. However, currently manual
re-adjustment or "re-track" trigger is needed.
Compositor changes:
- Added new node called Plane Track Deform.
- User selects which plane track to use (for this he need
to select movie clip datablock, object and track names).
- Node gets an image input, which need to be warped into
the plane.
- Node outputs:
* Input image warped into the plane.
* Plane, rasterized to a mask.
Masking changes:
- Mask points might be parented to a plane track, which
makes this point deforming in a way as if it belongs
to the tracked plane.
Some video tutorials are available:
- Coder video: http://www.youtube.com/watch?v=vISEwqNHqe4
- Artist video: https://vimeo.com/71727578
This is mine and Keir's holiday code project :)
2013-08-16 09:46:30 +00:00
|
|
|
break;
|
2014-03-11 14:07:49 +01:00
|
|
|
case CMP_NODE_CORNERPIN:
|
|
|
|
ntype->draw_buttons = node_composit_buts_cornerpin;
|
|
|
|
break;
|
2014-07-26 12:59:29 +02:00
|
|
|
case CMP_NODE_SUNBEAMS:
|
|
|
|
ntype->draw_buttons = node_composit_buts_sunbeams;
|
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ****************** BUTTON CALLBACKS FOR TEXTURE NODES ***************** */
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_texture_buts_bricks(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-10-28 22:14:31 +00:00
|
|
|
uiLayout *col;
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2014-01-02 20:54:24 +01:00
|
|
|
uiItemR(col, ptr, "offset", UI_ITEM_R_SLIDER, IFACE_("Offset"), ICON_NONE);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "offset_frequency", 0, IFACE_("Frequency"), ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, true);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, ptr, "squash", 0, IFACE_("Squash"), ICON_NONE);
|
|
|
|
uiItemR(col, ptr, "squash_frequency", 0, IFACE_("Frequency"), ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-12-05 21:14:31 +00:00
|
|
|
PointerRNA tex_ptr;
|
2012-05-27 19:38:10 +00:00
|
|
|
bNode *node = ptr->data;
|
|
|
|
ID *id = ptr->id.data;
|
2008-12-24 10:33:10 +00:00
|
|
|
Tex *tex = (Tex *)node->storage;
|
2009-12-05 21:14:31 +00:00
|
|
|
uiLayout *col, *row;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2009-12-05 21:14:31 +00:00
|
|
|
RNA_pointer_create(id, &RNA_Texture, tex, &tex_ptr);
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2009-12-05 21:14:31 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
switch (tex->type) {
|
2008-12-24 10:33:10 +00:00
|
|
|
case TEX_BLEND:
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, &tex_ptr, "progression", 0, "", ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
break;
|
2009-12-05 21:14:31 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
case TEX_MARBLE:
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, &tex_ptr, "marble_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-05 06:05:55 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-05 06:05:55 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TEX_MAGIC:
|
|
|
|
uiItemR(col, &tex_ptr, "noise_depth", 0, NULL, ICON_NONE);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TEX_STUCCI:
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-05 06:05:55 +00:00
|
|
|
uiItemR(row, &tex_ptr, "stucci_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-05 06:05:55 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
break;
|
2009-12-05 21:14:31 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
case TEX_WOOD:
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
|
|
|
|
uiItemR(col, &tex_ptr, "wood_type", 0, "", ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-04-05 06:05:55 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_basis_2", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2012-07-09 23:07:15 +00:00
|
|
|
uiLayoutSetActive(row, !(ELEM(tex->stype, TEX_BAND, TEX_RING)));
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
|
|
|
case TEX_CLOUDS:
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, &tex_ptr, "cloud_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(col, false);
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
2012-06-02 19:58:12 +00:00
|
|
|
uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, IFACE_("Depth"), ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
|
|
|
case TEX_DISTNOISE:
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
|
|
|
|
uiItemR(col, &tex_ptr, "noise_distortion", 0, "", ICON_NONE);
|
2009-09-16 18:59:13 +00:00
|
|
|
break;
|
2011-04-05 06:05:55 +00:00
|
|
|
|
|
|
|
case TEX_MUSGRAVE:
|
|
|
|
uiItemR(col, &tex_ptr, "musgrave_type", 0, "", ICON_NONE);
|
|
|
|
uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NONE);
|
|
|
|
break;
|
|
|
|
case TEX_VORONOI:
|
|
|
|
uiItemR(col, &tex_ptr, "distance_metric", 0, "", ICON_NONE);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (tex->vn_distm == TEX_MINKOVSKY) {
|
2011-04-05 06:05:55 +00:00
|
|
|
uiItemR(col, &tex_ptr, "minkovsky_exponent", 0, NULL, ICON_NONE);
|
|
|
|
}
|
|
|
|
uiItemR(col, &tex_ptr, "color_mode", 0, "", ICON_NONE);
|
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2010-08-04 12:18:07 +00:00
|
|
|
uiTemplateID(layout, C, ptr, "image", NULL, "IMAGE_OT_open", NULL);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
2013-10-10 11:33:20 +00:00
|
|
|
static void node_texture_buts_image_ex(uiLayout *layout, bContext *C, PointerRNA *ptr)
|
2013-07-22 08:56:51 +00:00
|
|
|
{
|
|
|
|
bNode *node = ptr->data;
|
|
|
|
PointerRNA iuserptr;
|
|
|
|
|
|
|
|
RNA_pointer_create((ID *)ptr->id.data, &RNA_ImageUser, node->storage, &iuserptr);
|
2015-06-13 14:04:39 -03:00
|
|
|
uiTemplateImage(layout, C, ptr, "image", &iuserptr, 0, 0);
|
2013-07-22 08:56:51 +00:00
|
|
|
}
|
|
|
|
|
2010-10-14 01:22:14 +00:00
|
|
|
static void node_texture_buts_output(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2011-02-27 18:03:19 +00:00
|
|
|
uiItemR(layout, ptr, "filepath", 0, "", ICON_NONE);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* only once called */
|
|
|
|
static void node_texture_set_butfunc(bNodeType *ntype)
|
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
if (ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX) {
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_texture_buts_proc;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2012-04-28 06:31:57 +00:00
|
|
|
else {
|
|
|
|
switch (ntype->type) {
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_MATH:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_math;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_MIX_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_mix_rgb;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_VALTORGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_colorramp;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_CURVE_RGB:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_curvecol;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_CURVE_TIME:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_time;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_TEXTURE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_buts_texture;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_BRICKS:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_texture_buts_bricks;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_IMAGE:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_texture_buts_image;
|
|
|
|
ntype->draw_buttons_ex = node_texture_buts_image_ex;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
case TEX_NODE_OUTPUT:
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = node_texture_buts_output;
|
2012-05-27 19:38:10 +00:00
|
|
|
break;
|
2012-04-28 06:31:57 +00:00
|
|
|
}
|
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ******* init draw callbacks for all tree types, only called in usiblender.c, once ************* */
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
static void node_property_update_default(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
bNodeTree *ntree = ptr->id.data;
|
|
|
|
ED_node_tag_update_nodetree(bmain, ntree);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_socket_template_properties_update(bNodeType *ntype, bNodeSocketTemplate *stemp)
|
|
|
|
{
|
|
|
|
StructRNA *srna = ntype->ext.srna;
|
|
|
|
PropertyRNA *prop = RNA_struct_type_find_property(srna, stemp->identifier);
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
if (prop)
|
|
|
|
RNA_def_property_update_runtime(prop, node_property_update_default);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_template_properties_update(bNodeType *ntype)
|
|
|
|
{
|
|
|
|
bNodeSocketTemplate *stemp;
|
|
|
|
|
|
|
|
if (ntype->inputs) {
|
|
|
|
for (stemp = ntype->inputs; stemp->type >= 0; ++stemp)
|
|
|
|
node_socket_template_properties_update(ntype, stemp);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2013-03-18 16:34:57 +00:00
|
|
|
if (ntype->outputs) {
|
|
|
|
for (stemp = ntype->outputs; stemp->type >= 0; ++stemp)
|
|
|
|
node_socket_template_properties_update(ntype, stemp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-08 14:58:41 +00:00
|
|
|
static void node_socket_undefined_draw(bContext *UNUSED(C), uiLayout *layout, PointerRNA *UNUSED(ptr), PointerRNA *UNUSED(node_ptr),
|
|
|
|
const char *UNUSED(text))
|
2013-03-19 13:40:16 +00:00
|
|
|
{
|
2014-04-03 22:49:27 +04:00
|
|
|
uiItemL(layout, IFACE_("Undefined Socket Type"), ICON_ERROR);
|
2013-03-19 13:40:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void node_socket_undefined_draw_color(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PointerRNA *UNUSED(node_ptr), float *r_color)
|
|
|
|
{
|
|
|
|
r_color[0] = 1.0f;
|
|
|
|
r_color[1] = 0.0f;
|
|
|
|
r_color[2] = 0.0f;
|
|
|
|
r_color[3] = 1.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_socket_undefined_interface_draw(bContext *UNUSED(C), uiLayout *layout, PointerRNA *UNUSED(ptr))
|
|
|
|
{
|
2014-04-03 22:49:27 +04:00
|
|
|
uiItemL(layout, IFACE_("Undefined Socket Type"), ICON_ERROR);
|
2013-03-19 13:40:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void node_socket_undefined_interface_draw_color(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), float *r_color)
|
|
|
|
{
|
|
|
|
r_color[0] = 1.0f;
|
|
|
|
r_color[1] = 0.0f;
|
|
|
|
r_color[2] = 0.0f;
|
|
|
|
r_color[3] = 1.0f;
|
|
|
|
}
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
void ED_node_init_butfuncs(void)
|
|
|
|
{
|
2013-03-19 13:40:16 +00:00
|
|
|
/* Fallback types for undefined tree, nodes, sockets
|
|
|
|
* Defined in blenkernel, but not registered in type hashes.
|
|
|
|
*/
|
|
|
|
/*extern bNodeTreeType NodeTreeTypeUndefined;*/
|
|
|
|
extern bNodeType NodeTypeUndefined;
|
|
|
|
extern bNodeSocketType NodeSocketTypeUndefined;
|
|
|
|
|
|
|
|
/* default ui functions */
|
2013-10-10 11:33:20 +00:00
|
|
|
NodeTypeUndefined.draw_nodetype = node_draw_default;
|
|
|
|
NodeTypeUndefined.draw_nodetype_prepare = node_update_default;
|
2013-03-19 13:40:16 +00:00
|
|
|
NodeTypeUndefined.select_area_func = node_select_area_default;
|
|
|
|
NodeTypeUndefined.tweak_area_func = node_tweak_area_default;
|
2013-10-10 11:33:20 +00:00
|
|
|
NodeTypeUndefined.draw_buttons = NULL;
|
|
|
|
NodeTypeUndefined.draw_buttons_ex = NULL;
|
2013-03-19 13:40:16 +00:00
|
|
|
NodeTypeUndefined.resize_area_func = node_resize_area_default;
|
|
|
|
|
|
|
|
NodeSocketTypeUndefined.draw = node_socket_undefined_draw;
|
|
|
|
NodeSocketTypeUndefined.draw_color = node_socket_undefined_draw_color;
|
|
|
|
NodeSocketTypeUndefined.interface_draw = node_socket_undefined_interface_draw;
|
|
|
|
NodeSocketTypeUndefined.interface_draw_color = node_socket_undefined_interface_draw_color;
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
/* node type ui functions */
|
|
|
|
NODE_TYPES_BEGIN(ntype)
|
|
|
|
/* default ui functions */
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_nodetype = node_draw_default;
|
|
|
|
ntype->draw_nodetype_prepare = node_update_default;
|
2013-03-18 16:34:57 +00:00
|
|
|
ntype->select_area_func = node_select_area_default;
|
|
|
|
ntype->tweak_area_func = node_tweak_area_default;
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_buttons = NULL;
|
|
|
|
ntype->draw_buttons_ex = NULL;
|
2013-03-18 16:34:57 +00:00
|
|
|
ntype->resize_area_func = node_resize_area_default;
|
|
|
|
|
|
|
|
node_common_set_butfunc(ntype);
|
|
|
|
|
|
|
|
node_composit_set_butfunc(ntype);
|
|
|
|
node_shader_set_butfunc(ntype);
|
|
|
|
node_texture_set_butfunc(ntype);
|
|
|
|
|
|
|
|
/* define update callbacks for socket properties */
|
|
|
|
node_template_properties_update(ntype);
|
|
|
|
NODE_TYPES_END
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
/* tree type icons */
|
|
|
|
ntreeType_Composite->ui_icon = ICON_RENDERLAYERS;
|
|
|
|
ntreeType_Shader->ui_icon = ICON_MATERIAL;
|
|
|
|
ntreeType_Texture->ui_icon = ICON_TEXTURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ED_init_custom_node_type(bNodeType *ntype)
|
|
|
|
{
|
|
|
|
/* default ui functions */
|
2013-10-10 11:33:20 +00:00
|
|
|
ntype->draw_nodetype = node_draw_default;
|
|
|
|
ntype->draw_nodetype_prepare = node_update_default;
|
2013-03-18 16:34:57 +00:00
|
|
|
ntype->resize_area_func = node_resize_area_default;
|
|
|
|
ntype->select_area_func = node_select_area_default;
|
|
|
|
ntype->tweak_area_func = node_tweak_area_default;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ED_init_custom_node_socket_type(bNodeSocketType *stype)
|
|
|
|
{
|
|
|
|
/* default ui functions */
|
|
|
|
stype->draw = node_socket_button_label;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* maps standard socket integer type to a color */
|
|
|
|
static const float std_node_socket_colors[][4] = {
|
2013-03-24 01:19:55 +00:00
|
|
|
{0.63, 0.63, 0.63, 1.0}, /* SOCK_FLOAT */
|
|
|
|
{0.39, 0.39, 0.78, 1.0}, /* SOCK_VECTOR */
|
|
|
|
{0.78, 0.78, 0.16, 1.0}, /* SOCK_RGBA */
|
|
|
|
{0.39, 0.78, 0.39, 1.0}, /* SOCK_SHADER */
|
|
|
|
{0.70, 0.65, 0.19, 1.0}, /* SOCK_BOOLEAN */
|
|
|
|
{0.0, 0.0, 0.0, 1.0}, /*__SOCK_MESH (deprecated) */
|
|
|
|
{0.06, 0.52, 0.15, 1.0}, /* SOCK_INT */
|
|
|
|
{1.0, 1.0, 1.0, 1.0}, /* SOCK_STRING */
|
2013-03-18 16:34:57 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* common color callbacks for standard types */
|
|
|
|
static void std_node_socket_draw_color(bContext *UNUSED(C), PointerRNA *ptr, PointerRNA *UNUSED(node_ptr), float *r_color)
|
|
|
|
{
|
|
|
|
bNodeSocket *sock = ptr->data;
|
|
|
|
int type = sock->typeinfo->type;
|
|
|
|
copy_v4_v4(r_color, std_node_socket_colors[type]);
|
|
|
|
}
|
|
|
|
static void std_node_socket_interface_draw_color(bContext *UNUSED(C), PointerRNA *ptr, float *r_color)
|
|
|
|
{
|
|
|
|
bNodeSocket *sock = ptr->data;
|
|
|
|
int type = sock->typeinfo->type;
|
|
|
|
copy_v4_v4(r_color, std_node_socket_colors[type]);
|
|
|
|
}
|
|
|
|
|
2013-10-10 13:07:09 +00:00
|
|
|
/* draw function for file output node sockets, displays only sub-path and format, no value button */
|
|
|
|
static void node_file_output_socket_draw(bContext *C, uiLayout *layout, PointerRNA *ptr, PointerRNA *node_ptr)
|
|
|
|
{
|
|
|
|
bNodeTree *ntree = ptr->id.data;
|
|
|
|
bNodeSocket *sock = ptr->data;
|
|
|
|
uiLayout *row;
|
|
|
|
PointerRNA inputptr, imfptr;
|
|
|
|
int imtype;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
row = uiLayoutRow(layout, false);
|
2013-10-10 13:07:09 +00:00
|
|
|
|
|
|
|
imfptr = RNA_pointer_get(node_ptr, "format");
|
|
|
|
imtype = RNA_enum_get(&imfptr, "file_format");
|
2015-04-06 10:40:12 -03:00
|
|
|
|
2013-10-10 13:07:09 +00:00
|
|
|
if (imtype == R_IMF_IMTYPE_MULTILAYER) {
|
|
|
|
NodeImageMultiFileSocket *input = sock->storage;
|
|
|
|
RNA_pointer_create(&ntree->id, &RNA_NodeOutputFileSlotLayer, input, &inputptr);
|
|
|
|
|
|
|
|
uiItemL(row, input->layer, ICON_NONE);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
NodeImageMultiFileSocket *input = sock->storage;
|
|
|
|
PropertyRNA *imtype_prop;
|
|
|
|
const char *imtype_name;
|
|
|
|
uiBlock *block;
|
|
|
|
RNA_pointer_create(&ntree->id, &RNA_NodeOutputFileSlotFile, input, &inputptr);
|
|
|
|
|
|
|
|
uiItemL(row, input->path, ICON_NONE);
|
|
|
|
|
|
|
|
if (!RNA_boolean_get(&inputptr, "use_node_format"))
|
|
|
|
imfptr = RNA_pointer_get(&inputptr, "format");
|
|
|
|
|
|
|
|
imtype_prop = RNA_struct_find_property(&imfptr, "file_format");
|
|
|
|
RNA_property_enum_name((bContext *)C, &imfptr, imtype_prop,
|
|
|
|
RNA_property_enum_get(&imfptr, imtype_prop), &imtype_name);
|
|
|
|
block = uiLayoutGetBlock(row);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_emboss_set(block, UI_EMBOSS_PULLDOWN);
|
2013-10-10 13:07:09 +00:00
|
|
|
uiItemL(row, imtype_name, ICON_NONE);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_emboss_set(block, UI_EMBOSS_NONE);
|
2013-10-10 13:07:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-08 14:58:41 +00:00
|
|
|
static void std_node_socket_draw(bContext *C, uiLayout *layout, PointerRNA *ptr, PointerRNA *node_ptr, const char *text)
|
2013-03-18 16:34:57 +00:00
|
|
|
{
|
2013-10-10 13:07:09 +00:00
|
|
|
bNode *node = node_ptr->data;
|
2013-03-18 16:34:57 +00:00
|
|
|
bNodeSocket *sock = ptr->data;
|
|
|
|
int type = sock->typeinfo->type;
|
|
|
|
/*int subtype = sock->typeinfo->subtype;*/
|
|
|
|
|
2013-10-10 13:07:09 +00:00
|
|
|
/* XXX not nice, eventually give this node its own socket type ... */
|
|
|
|
if (node->type == CMP_NODE_OUTPUT_FILE) {
|
|
|
|
node_file_output_socket_draw(C, layout, ptr, node_ptr);
|
2014-02-19 11:54:28 +01:00
|
|
|
return;
|
2013-10-10 13:07:09 +00:00
|
|
|
}
|
|
|
|
|
2013-10-10 12:58:35 +00:00
|
|
|
if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_IN_USE) || (sock->flag & SOCK_HIDE_VALUE)) {
|
2013-05-08 14:58:41 +00:00
|
|
|
node_socket_button_label(C, layout, ptr, node_ptr, text);
|
2013-05-08 14:58:37 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
switch (type) {
|
|
|
|
case SOCK_FLOAT:
|
|
|
|
case SOCK_INT:
|
|
|
|
case SOCK_BOOLEAN:
|
2013-05-08 14:58:41 +00:00
|
|
|
uiItemR(layout, ptr, "default_value", 0, text, 0);
|
2013-03-18 16:34:57 +00:00
|
|
|
break;
|
|
|
|
case SOCK_VECTOR:
|
2013-05-08 14:58:41 +00:00
|
|
|
uiTemplateComponentMenu(layout, ptr, "default_value", text);
|
2013-03-18 16:34:57 +00:00
|
|
|
break;
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_RGBA:
|
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
uiLayout *row = uiLayoutRow(layout, false);
|
|
|
|
uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT);
|
|
|
|
/* draw the socket name right of the actual button */
|
|
|
|
uiItemR(row, ptr, "default_value", 0, "", 0);
|
2013-05-08 14:58:41 +00:00
|
|
|
uiItemL(row, text, 0);
|
2013-03-18 16:34:57 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_STRING:
|
|
|
|
{
|
2013-03-18 16:34:57 +00:00
|
|
|
uiLayout *row = uiLayoutRow(layout, true);
|
|
|
|
/* draw the socket name right of the actual button */
|
|
|
|
uiItemR(row, ptr, "default_value", 0, "", 0);
|
2013-05-08 14:58:41 +00:00
|
|
|
uiItemL(row, text, 0);
|
2013-03-18 16:34:57 +00:00
|
|
|
break;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
2013-03-19 10:03:52 +00:00
|
|
|
default:
|
2013-05-08 14:58:41 +00:00
|
|
|
node_socket_button_label(C, layout, ptr, node_ptr, text);
|
2013-03-19 10:03:52 +00:00
|
|
|
break;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-28 10:32:04 +00:00
|
|
|
static void std_node_socket_interface_draw(bContext *UNUSED(C), uiLayout *layout, PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
bNodeSocket *sock = ptr->data;
|
|
|
|
int type = sock->typeinfo->type;
|
|
|
|
/*int subtype = sock->typeinfo->subtype;*/
|
|
|
|
|
|
|
|
switch (type) {
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_FLOAT:
|
|
|
|
{
|
2013-03-28 10:32:04 +00:00
|
|
|
uiLayout *row;
|
|
|
|
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
|
|
|
|
row = uiLayoutRow(layout, true);
|
2014-04-03 22:49:27 +04:00
|
|
|
uiItemR(row, ptr, "min_value", 0, IFACE_("Min"), 0);
|
|
|
|
uiItemR(row, ptr, "max_value", 0, IFACE_("Max"), 0);
|
2013-03-28 10:32:04 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_INT:
|
|
|
|
{
|
2013-03-28 10:32:04 +00:00
|
|
|
uiLayout *row;
|
|
|
|
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
|
|
|
|
row = uiLayoutRow(layout, true);
|
2014-04-03 22:49:27 +04:00
|
|
|
uiItemR(row, ptr, "min_value", 0, IFACE_("Min"), 0);
|
|
|
|
uiItemR(row, ptr, "max_value", 0, IFACE_("Max"), 0);
|
2013-03-28 10:32:04 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_BOOLEAN:
|
|
|
|
{
|
2013-03-28 10:32:04 +00:00
|
|
|
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
|
|
|
|
break;
|
|
|
|
}
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_VECTOR:
|
|
|
|
{
|
2013-03-28 10:32:04 +00:00
|
|
|
uiLayout *row;
|
|
|
|
uiItemR(layout, ptr, "default_value", UI_ITEM_R_EXPAND, NULL, 0);
|
|
|
|
row = uiLayoutRow(layout, true);
|
2014-04-03 22:49:27 +04:00
|
|
|
uiItemR(row, ptr, "min_value", 0, IFACE_("Min"), 0);
|
|
|
|
uiItemR(row, ptr, "max_value", 0, IFACE_("Max"), 0);
|
2013-03-28 10:32:04 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_RGBA:
|
|
|
|
{
|
2013-03-28 10:32:04 +00:00
|
|
|
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
|
|
|
|
break;
|
|
|
|
}
|
2013-07-19 10:40:43 +00:00
|
|
|
case SOCK_STRING:
|
|
|
|
{
|
2013-03-28 10:32:04 +00:00
|
|
|
uiItemR(layout, ptr, "default_value", 0, NULL, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
void ED_init_standard_node_socket_type(bNodeSocketType *stype)
|
|
|
|
{
|
|
|
|
stype->draw = std_node_socket_draw;
|
|
|
|
stype->draw_color = std_node_socket_draw_color;
|
2013-03-28 10:32:04 +00:00
|
|
|
stype->interface_draw = std_node_socket_interface_draw;
|
2013-03-18 16:34:57 +00:00
|
|
|
stype->interface_draw_color = std_node_socket_interface_draw_color;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void node_socket_virtual_draw_color(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PointerRNA *UNUSED(node_ptr), float *r_color)
|
|
|
|
{
|
|
|
|
/* alpha = 0, empty circle */
|
|
|
|
zero_v4(r_color);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ED_init_node_socket_type_virtual(bNodeSocketType *stype)
|
|
|
|
{
|
|
|
|
stype->draw = node_socket_button_label;
|
|
|
|
stype->draw_color = node_socket_virtual_draw_color;
|
|
|
|
}
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* ************** Generic drawing ************** */
|
|
|
|
|
2013-04-24 16:36:50 +00:00
|
|
|
void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeInstanceKey parent_key)
|
|
|
|
{
|
|
|
|
bNodeInstanceKey active_viewer_key = (snode->nodetree ? snode->nodetree->active_viewer_key : NODE_INSTANCE_KEY_NONE);
|
|
|
|
Image *ima;
|
|
|
|
void *lock;
|
|
|
|
ImBuf *ibuf;
|
|
|
|
|
|
|
|
if (!(snode->flag & SNODE_BACKDRAW) || !ED_node_is_compositor(snode))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (parent_key.value != active_viewer_key.value)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ima = BKE_image_verify_viewer(IMA_TYPE_COMPOSITE, "Viewer Node");
|
|
|
|
ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
|
|
|
|
if (ibuf) {
|
|
|
|
float x, y;
|
|
|
|
|
|
|
|
glMatrixMode(GL_PROJECTION);
|
|
|
|
glPushMatrix();
|
|
|
|
glMatrixMode(GL_MODELVIEW);
|
|
|
|
glPushMatrix();
|
|
|
|
|
|
|
|
/* somehow the offset has to be calculated inverse */
|
|
|
|
|
|
|
|
glaDefine2DArea(&ar->winrct);
|
2015-01-21 23:01:50 +11:00
|
|
|
wmOrtho2_region_pixelspace(ar);
|
2013-04-24 16:36:50 +00:00
|
|
|
|
|
|
|
x = (ar->winx - snode->zoom * ibuf->x) / 2 + snode->xof;
|
|
|
|
y = (ar->winy - snode->zoom * ibuf->y) / 2 + snode->yof;
|
|
|
|
|
|
|
|
if (ibuf->rect || ibuf->rect_float) {
|
|
|
|
unsigned char *display_buffer = NULL;
|
|
|
|
void *cache_handle = NULL;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2013-04-24 16:36:50 +00:00
|
|
|
if (snode->flag & (SNODE_SHOW_R | SNODE_SHOW_G | SNODE_SHOW_B)) {
|
|
|
|
int ofs;
|
|
|
|
|
|
|
|
display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
|
|
|
|
|
2012-07-06 11:24:43 +00:00
|
|
|
#ifdef __BIG_ENDIAN__
|
2013-04-24 16:36:50 +00:00
|
|
|
if (snode->flag & SNODE_SHOW_R) ofs = 2;
|
|
|
|
else if (snode->flag & SNODE_SHOW_G) ofs = 1;
|
|
|
|
else ofs = 0;
|
2012-07-06 11:24:43 +00:00
|
|
|
#else
|
2013-04-24 16:36:50 +00:00
|
|
|
if (snode->flag & SNODE_SHOW_R) ofs = 1;
|
|
|
|
else if (snode->flag & SNODE_SHOW_G) ofs = 2;
|
|
|
|
else ofs = 3;
|
2012-07-06 11:24:43 +00:00
|
|
|
#endif
|
2013-04-24 16:36:50 +00:00
|
|
|
|
|
|
|
glPixelZoom(snode->zoom, snode->zoom);
|
|
|
|
/* swap bytes, so alpha is most significant one, then just draw it as luminance int */
|
|
|
|
|
|
|
|
glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT,
|
|
|
|
display_buffer + ofs);
|
|
|
|
|
|
|
|
glPixelZoom(1.0f, 1.0f);
|
|
|
|
}
|
|
|
|
else if (snode->flag & SNODE_SHOW_ALPHA) {
|
|
|
|
display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
|
|
|
|
|
|
|
|
glPixelZoom(snode->zoom, snode->zoom);
|
|
|
|
/* swap bytes, so alpha is most significant one, then just draw it as luminance int */
|
2012-07-06 11:24:43 +00:00
|
|
|
#ifdef __BIG_ENDIAN__
|
2013-04-24 16:36:50 +00:00
|
|
|
glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
|
2012-07-06 11:24:43 +00:00
|
|
|
#endif
|
2013-04-24 16:36:50 +00:00
|
|
|
glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_LUMINANCE, GL_UNSIGNED_INT, display_buffer);
|
|
|
|
|
2012-07-06 11:24:43 +00:00
|
|
|
#ifdef __BIG_ENDIAN__
|
2013-04-24 16:36:50 +00:00
|
|
|
glPixelStorei(GL_UNPACK_SWAP_BYTES, 0);
|
2012-07-06 11:24:43 +00:00
|
|
|
#endif
|
2013-04-24 16:36:50 +00:00
|
|
|
glPixelZoom(1.0f, 1.0f);
|
2013-04-04 12:20:13 +00:00
|
|
|
}
|
2013-04-24 16:36:50 +00:00
|
|
|
else if (snode->flag & SNODE_USE_ALPHA) {
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
glPixelZoom(snode->zoom, snode->zoom);
|
|
|
|
|
|
|
|
glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST);
|
|
|
|
|
|
|
|
glPixelZoom(1.0f, 1.0f);
|
|
|
|
glDisable(GL_BLEND);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
glPixelZoom(snode->zoom, snode->zoom);
|
|
|
|
|
|
|
|
glaDrawImBuf_glsl_ctx(C, ibuf, x, y, GL_NEAREST);
|
|
|
|
|
|
|
|
glPixelZoom(1.0f, 1.0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cache_handle)
|
|
|
|
IMB_display_buffer_release(cache_handle);
|
|
|
|
}
|
|
|
|
|
2014-05-19 18:00:20 +10:00
|
|
|
/** \note draw selected info on backdrop */
|
2013-04-24 16:36:50 +00:00
|
|
|
if (snode->edittree) {
|
|
|
|
bNode *node = snode->edittree->nodes.first;
|
|
|
|
rctf *viewer_border = &snode->nodetree->viewer_border;
|
|
|
|
while (node) {
|
|
|
|
if (node->flag & NODE_SELECT) {
|
2013-10-10 11:33:20 +00:00
|
|
|
if (node->typeinfo->draw_backdrop) {
|
|
|
|
node->typeinfo->draw_backdrop(snode, ibuf, node, x, y);
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
}
|
2013-03-07 17:47:30 +00:00
|
|
|
}
|
2013-04-24 16:36:50 +00:00
|
|
|
node = node->next;
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2013-04-24 16:36:50 +00:00
|
|
|
if ((snode->nodetree->flag & NTREE_VIEWER_BORDER) &&
|
2014-06-05 20:05:41 +06:00
|
|
|
viewer_border->xmin < viewer_border->xmax &&
|
|
|
|
viewer_border->ymin < viewer_border->ymax)
|
2013-04-24 16:36:50 +00:00
|
|
|
{
|
2014-06-05 20:05:41 +06:00
|
|
|
rcti pixel_border;
|
|
|
|
UI_ThemeColor(TH_ACTIVE);
|
|
|
|
BLI_rcti_init(&pixel_border,
|
|
|
|
x + snode->zoom * viewer_border->xmin * ibuf->x,
|
|
|
|
x + snode->zoom * viewer_border->xmax * ibuf->x,
|
|
|
|
y + snode->zoom * viewer_border->ymin * ibuf->y,
|
|
|
|
y + snode->zoom * viewer_border->ymax * ibuf->y);
|
|
|
|
glaDrawBorderCorners(&pixel_border, 1.0f, 1.0f);
|
2013-04-24 16:36:50 +00:00
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2013-04-24 16:36:50 +00:00
|
|
|
|
|
|
|
glMatrixMode(GL_PROJECTION);
|
|
|
|
glPopMatrix();
|
|
|
|
glMatrixMode(GL_MODELVIEW);
|
|
|
|
glPopMatrix();
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2013-04-24 16:36:50 +00:00
|
|
|
|
|
|
|
BKE_image_release_ibuf(ima, ibuf, lock);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-02-07 14:03:34 +00:00
|
|
|
/* if v2d not NULL, it clips and returns 0 if not visible */
|
|
|
|
int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, float coord_array[][2], int resol)
|
2008-12-24 10:33:10 +00:00
|
|
|
{
|
2009-02-07 14:03:34 +00:00
|
|
|
float dist, vec[4][2];
|
2012-06-01 12:38:03 +00:00
|
|
|
float deltax, deltay;
|
2013-09-05 13:03:03 +00:00
|
|
|
float cursor[2] = {0.0f, 0.0f};
|
2012-06-01 12:38:03 +00:00
|
|
|
int toreroute, fromreroute;
|
2013-09-05 13:03:03 +00:00
|
|
|
|
|
|
|
/* this function can be called with snode null (via cut_links_intersect) */
|
|
|
|
/* XXX map snode->cursor back to view space */
|
|
|
|
if (snode) {
|
|
|
|
cursor[0] = snode->cursor[0] * UI_DPI_FAC;
|
|
|
|
cursor[1] = snode->cursor[1] * UI_DPI_FAC;
|
|
|
|
}
|
|
|
|
|
2009-02-07 14:03:34 +00:00
|
|
|
/* in v0 and v3 we put begin/end points */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (link->fromsock) {
|
2012-05-27 19:38:10 +00:00
|
|
|
vec[0][0] = link->fromsock->locx;
|
|
|
|
vec[0][1] = link->fromsock->locy;
|
2012-06-01 12:38:03 +00:00
|
|
|
fromreroute = (link->fromnode && link->fromnode->type == NODE_REROUTE);
|
2009-02-07 14:03:34 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-27 19:38:10 +00:00
|
|
|
if (snode == NULL) return 0;
|
2013-09-05 13:03:03 +00:00
|
|
|
copy_v2_v2(vec[0], cursor);
|
2012-06-01 12:38:03 +00:00
|
|
|
fromreroute = 0;
|
2009-02-07 14:03:34 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (link->tosock) {
|
2012-05-27 19:38:10 +00:00
|
|
|
vec[3][0] = link->tosock->locx;
|
|
|
|
vec[3][1] = link->tosock->locy;
|
2012-06-01 12:38:03 +00:00
|
|
|
toreroute = (link->tonode && link->tonode->type == NODE_REROUTE);
|
2009-02-07 14:03:34 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-27 19:38:10 +00:00
|
|
|
if (snode == NULL) return 0;
|
2013-09-05 13:03:03 +00:00
|
|
|
copy_v2_v2(vec[3], cursor);
|
2012-06-01 12:38:03 +00:00
|
|
|
toreroute = 0;
|
2009-02-07 14:03:34 +00:00
|
|
|
}
|
2011-08-04 10:05:14 +00:00
|
|
|
|
2013-12-01 13:11:12 +11:00
|
|
|
dist = UI_GetThemeValue(TH_NODE_CURVING) * 0.10f * fabsf(vec[0][0] - vec[3][0]);
|
2012-06-01 12:38:03 +00:00
|
|
|
deltax = vec[3][0] - vec[0][0];
|
|
|
|
deltay = vec[3][1] - vec[0][1];
|
2008-12-24 10:33:10 +00:00
|
|
|
/* check direction later, for top sockets */
|
2012-06-01 12:38:03 +00:00
|
|
|
if (fromreroute) {
|
2012-07-09 23:07:15 +00:00
|
|
|
if (ABS(deltax) > ABS(deltay)) {
|
|
|
|
vec[1][1] = vec[0][1];
|
|
|
|
vec[1][0] = vec[0][0] + (deltax > 0 ? dist : -dist);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vec[1][0] = vec[0][0];
|
|
|
|
vec[1][1] = vec[0][1] + (deltay > 0 ? dist : -dist);
|
2012-06-01 12:38:03 +00:00
|
|
|
}
|
2012-07-09 23:07:15 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-06-01 12:38:03 +00:00
|
|
|
vec[1][0] = vec[0][0] + dist;
|
|
|
|
vec[1][1] = vec[0][1];
|
|
|
|
}
|
|
|
|
if (toreroute) {
|
2012-07-09 23:07:15 +00:00
|
|
|
if (ABS(deltax) > ABS(deltay)) {
|
|
|
|
vec[2][1] = vec[3][1];
|
|
|
|
vec[2][0] = vec[3][0] + (deltax > 0 ? -dist : dist);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vec[2][0] = vec[3][0];
|
|
|
|
vec[2][1] = vec[3][1] + (deltay > 0 ? -dist : dist);
|
2012-06-01 12:38:03 +00:00
|
|
|
}
|
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-06-01 12:38:03 +00:00
|
|
|
vec[2][0] = vec[3][0] - dist;
|
|
|
|
vec[2][1] = vec[3][1];
|
|
|
|
}
|
2012-12-21 05:07:26 +00:00
|
|
|
if (v2d && min_ffff(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) > v2d->cur.xmax) {
|
2012-07-09 23:07:15 +00:00
|
|
|
/* clipped */
|
|
|
|
}
|
2012-12-21 05:07:26 +00:00
|
|
|
else if (v2d && max_ffff(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) < v2d->cur.xmin) {
|
2012-07-09 23:07:15 +00:00
|
|
|
/* clipped */
|
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
else {
|
2009-02-07 14:03:34 +00:00
|
|
|
/* always do all three, to prevent data hanging around */
|
2012-07-09 23:07:15 +00:00
|
|
|
BKE_curve_forward_diff_bezier(vec[0][0], vec[1][0], vec[2][0], vec[3][0],
|
|
|
|
coord_array[0] + 0, resol, sizeof(float) * 2);
|
|
|
|
BKE_curve_forward_diff_bezier(vec[0][1], vec[1][1], vec[2][1], vec[3][1],
|
|
|
|
coord_array[0] + 1, resol, sizeof(float) * 2);
|
2009-02-07 14:03:34 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
#define LINK_RESOL 24
|
2012-07-09 23:07:15 +00:00
|
|
|
#define LINK_ARROW 12 /* position of arrow on the link, LINK_RESOL/2 */
|
2015-08-04 21:56:43 +02:00
|
|
|
#define ARROW_SIZE (7 * UI_DPI_FAC)
|
2012-07-09 23:07:15 +00:00
|
|
|
void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link,
|
2014-02-03 18:55:59 +11:00
|
|
|
int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3)
|
2009-02-07 14:03:34 +00:00
|
|
|
{
|
2012-05-27 19:38:10 +00:00
|
|
|
float coord_array[LINK_RESOL + 1][2];
|
2009-02-07 14:03:34 +00:00
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (node_link_bezier_points(v2d, snode, link, coord_array, LINK_RESOL)) {
|
2009-02-07 14:03:34 +00:00
|
|
|
float dist, spline_step = 0.0f;
|
|
|
|
int i;
|
2012-06-01 12:38:03 +00:00
|
|
|
int drawarrow;
|
2011-01-09 18:59:35 +00:00
|
|
|
/* store current linewidth */
|
|
|
|
float linew;
|
2012-06-01 12:38:03 +00:00
|
|
|
float arrow[2], arrow1[2], arrow2[2];
|
2015-08-04 21:56:43 +02:00
|
|
|
const float px_fac = UI_DPI_WINDOW_FAC;
|
2011-01-09 18:59:35 +00:00
|
|
|
glGetFloatv(GL_LINE_WIDTH, &linew);
|
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* we can reuse the dist variable here to increment the GL curve eval amount*/
|
2012-05-27 19:38:10 +00:00
|
|
|
dist = 1.0f / (float)LINK_RESOL;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2011-01-09 18:59:35 +00:00
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
drawarrow = ((link->tonode && (link->tonode->type == NODE_REROUTE)) &&
|
|
|
|
(link->fromnode && (link->fromnode->type == NODE_REROUTE)));
|
|
|
|
|
2012-06-01 12:38:03 +00:00
|
|
|
if (drawarrow) {
|
2012-07-09 16:51:08 +00:00
|
|
|
/* draw arrow in line segment LINK_ARROW */
|
|
|
|
float d_xy[2], len;
|
|
|
|
|
|
|
|
sub_v2_v2v2(d_xy, coord_array[LINK_ARROW], coord_array[LINK_ARROW - 1]);
|
|
|
|
len = len_v2(d_xy);
|
2012-08-06 20:48:08 +00:00
|
|
|
mul_v2_fl(d_xy, ARROW_SIZE / len);
|
2012-07-09 16:51:08 +00:00
|
|
|
arrow1[0] = coord_array[LINK_ARROW][0] - d_xy[0] + d_xy[1];
|
|
|
|
arrow1[1] = coord_array[LINK_ARROW][1] - d_xy[1] - d_xy[0];
|
|
|
|
arrow2[0] = coord_array[LINK_ARROW][0] - d_xy[0] - d_xy[1];
|
|
|
|
arrow2[1] = coord_array[LINK_ARROW][1] - d_xy[1] + d_xy[0];
|
2012-06-01 12:38:03 +00:00
|
|
|
arrow[0] = coord_array[LINK_ARROW][0];
|
|
|
|
arrow[1] = coord_array[LINK_ARROW][1];
|
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (do_triple) {
|
2011-01-09 18:59:35 +00:00
|
|
|
UI_ThemeColorShadeAlpha(th_col3, -80, -120);
|
2015-08-04 21:56:43 +02:00
|
|
|
glLineWidth(4.0f * px_fac);
|
2011-01-09 18:59:35 +00:00
|
|
|
|
|
|
|
glBegin(GL_LINE_STRIP);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (i = 0; i <= LINK_RESOL; i++) {
|
2011-01-09 18:59:35 +00:00
|
|
|
glVertex2fv(coord_array[i]);
|
|
|
|
}
|
|
|
|
glEnd();
|
2012-06-01 12:38:03 +00:00
|
|
|
if (drawarrow) {
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
glVertex2fv(arrow1);
|
|
|
|
glVertex2fv(arrow);
|
|
|
|
glVertex2fv(arrow);
|
|
|
|
glVertex2fv(arrow2);
|
|
|
|
glEnd();
|
|
|
|
}
|
2011-01-09 18:59:35 +00:00
|
|
|
}
|
|
|
|
|
2011-11-29 20:35:30 +00:00
|
|
|
/* XXX using GL_LINES for shaded node lines is a workaround
|
|
|
|
* for Intel hardware, this breaks with GL_LINE_STRIP and
|
|
|
|
* changing color in begin/end blocks.
|
|
|
|
*/
|
2015-08-04 21:56:43 +02:00
|
|
|
glLineWidth(1.5f * px_fac);
|
2012-03-24 06:38:07 +00:00
|
|
|
if (do_shaded) {
|
2011-11-29 19:50:34 +00:00
|
|
|
glBegin(GL_LINES);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (i = 0; i < LINK_RESOL; i++) {
|
2008-12-24 10:33:10 +00:00
|
|
|
UI_ThemeColorBlend(th_col1, th_col2, spline_step);
|
2011-11-29 19:50:34 +00:00
|
|
|
glVertex2fv(coord_array[i]);
|
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
UI_ThemeColorBlend(th_col1, th_col2, spline_step + dist);
|
|
|
|
glVertex2fv(coord_array[i + 1]);
|
2011-11-29 19:50:34 +00:00
|
|
|
|
2009-02-07 14:03:34 +00:00
|
|
|
spline_step += dist;
|
2011-01-09 18:59:35 +00:00
|
|
|
}
|
2011-11-29 19:50:34 +00:00
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
UI_ThemeColor(th_col1);
|
|
|
|
glBegin(GL_LINE_STRIP);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (i = 0; i <= LINK_RESOL; i++) {
|
2011-11-29 19:50:34 +00:00
|
|
|
glVertex2fv(coord_array[i]);
|
|
|
|
}
|
|
|
|
glEnd();
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2011-01-09 18:59:35 +00:00
|
|
|
|
2012-06-01 12:38:03 +00:00
|
|
|
if (drawarrow) {
|
|
|
|
glBegin(GL_LINE_STRIP);
|
|
|
|
glVertex2fv(arrow1);
|
|
|
|
glVertex2fv(arrow);
|
|
|
|
glVertex2fv(arrow);
|
|
|
|
glVertex2fv(arrow2);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
2011-01-09 18:59:35 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
/* restore previuos linewidth */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
glLineWidth(1.0f);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
#if 0 /* not used in 2.5x yet */
|
2011-09-05 21:01:50 +00:00
|
|
|
static void node_link_straight_points(View2D *UNUSED(v2d), SpaceNode *snode, bNodeLink *link, float coord_array[][2])
|
|
|
|
{
|
2012-03-24 06:38:07 +00:00
|
|
|
if (link->fromsock) {
|
2012-05-27 19:38:10 +00:00
|
|
|
coord_array[0][0] = link->fromsock->locx;
|
|
|
|
coord_array[0][1] = link->fromsock->locy;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-27 19:38:10 +00:00
|
|
|
if (snode == NULL) return;
|
|
|
|
coord_array[0][0] = snode->mx;
|
|
|
|
coord_array[0][1] = snode->my;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
2012-03-24 06:38:07 +00:00
|
|
|
if (link->tosock) {
|
2012-05-27 19:38:10 +00:00
|
|
|
coord_array[1][0] = link->tosock->locx;
|
|
|
|
coord_array[1][1] = link->tosock->locy;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-05-27 19:38:10 +00:00
|
|
|
if (snode == NULL) return;
|
|
|
|
coord_array[1][0] = snode->mx;
|
|
|
|
coord_array[1][1] = snode->my;
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-09 23:07:15 +00:00
|
|
|
void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link,
|
|
|
|
int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3)
|
2011-09-05 21:01:50 +00:00
|
|
|
{
|
|
|
|
float coord_array[2][2];
|
|
|
|
float linew;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
node_link_straight_points(v2d, snode, link, coord_array);
|
|
|
|
|
|
|
|
/* store current linewidth */
|
|
|
|
glGetFloatv(GL_LINE_WIDTH, &linew);
|
|
|
|
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
|
2012-03-24 06:38:07 +00:00
|
|
|
if (do_triple) {
|
2011-09-05 21:01:50 +00:00
|
|
|
UI_ThemeColorShadeAlpha(th_col3, -80, -120);
|
|
|
|
glLineWidth(4.0f);
|
|
|
|
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
glVertex2fv(coord_array[0]);
|
|
|
|
glVertex2fv(coord_array[1]);
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
|
|
|
|
UI_ThemeColor(th_col1);
|
|
|
|
glLineWidth(1.5f);
|
|
|
|
|
2011-11-29 20:35:30 +00:00
|
|
|
/* XXX using GL_LINES for shaded node lines is a workaround
|
|
|
|
* for Intel hardware, this breaks with GL_LINE_STRIP and
|
|
|
|
* changing color in begin/end blocks.
|
|
|
|
*/
|
2012-03-24 06:38:07 +00:00
|
|
|
if (do_shaded) {
|
2011-11-29 20:35:30 +00:00
|
|
|
glBegin(GL_LINES);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (i = 0; i < LINK_RESOL - 1; ++i) {
|
|
|
|
float t = (float)i / (float)(LINK_RESOL - 1);
|
2011-09-05 21:01:50 +00:00
|
|
|
UI_ThemeColorBlend(th_col1, th_col2, t);
|
2012-07-09 23:07:15 +00:00
|
|
|
glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0],
|
|
|
|
(1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
|
2011-11-29 20:35:30 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
t = (float)(i + 1) / (float)(LINK_RESOL - 1);
|
2011-11-29 20:35:30 +00:00
|
|
|
UI_ThemeColorBlend(th_col1, th_col2, t);
|
2012-07-09 23:07:15 +00:00
|
|
|
glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0],
|
|
|
|
(1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
|
2011-11-29 20:35:30 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
glBegin(GL_LINE_STRIP);
|
2012-05-27 19:38:10 +00:00
|
|
|
for (i = 0; i < LINK_RESOL; ++i) {
|
|
|
|
float t = (float)i / (float)(LINK_RESOL - 1);
|
2012-07-09 23:07:15 +00:00
|
|
|
glVertex2f((1.0f - t) * coord_array[0][0] + t * coord_array[1][0],
|
|
|
|
(1.0f - t) * coord_array[0][1] + t * coord_array[1][1]);
|
2011-11-29 20:35:30 +00:00
|
|
|
}
|
|
|
|
glEnd();
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
glDisable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
/* restore previuos linewidth */
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
glLineWidth(1.0f);
|
2011-09-05 21:01:50 +00:00
|
|
|
}
|
2012-07-09 23:07:15 +00:00
|
|
|
#endif
|
2011-09-05 21:01:50 +00:00
|
|
|
|
2008-12-24 10:33:10 +00:00
|
|
|
/* note; this is used for fake links in groups too */
|
|
|
|
void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
|
|
|
|
{
|
2014-02-03 18:55:59 +11:00
|
|
|
bool do_shaded = false;
|
|
|
|
bool do_triple = false;
|
2014-10-17 10:18:40 +02:00
|
|
|
int th_col1 = TH_WIRE_INNER, th_col2 = TH_WIRE_INNER, th_col3 = TH_WIRE;
|
2008-12-24 10:33:10 +00:00
|
|
|
|
2012-05-27 19:38:10 +00:00
|
|
|
if (link->fromsock == NULL && link->tosock == NULL)
|
2008-12-24 10:33:10 +00:00
|
|
|
return;
|
|
|
|
|
2011-01-09 18:59:35 +00:00
|
|
|
/* new connection */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (!link->fromsock || !link->tosock) {
|
2011-01-09 18:59:35 +00:00
|
|
|
th_col1 = TH_ACTIVE;
|
2014-04-01 11:34:00 +11:00
|
|
|
do_triple = true;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* going to give issues once... */
|
2012-03-24 06:38:07 +00:00
|
|
|
if (link->tosock->flag & SOCK_UNAVAIL)
|
2008-12-24 10:33:10 +00:00
|
|
|
return;
|
2012-03-24 06:38:07 +00:00
|
|
|
if (link->fromsock->flag & SOCK_UNAVAIL)
|
2008-12-24 10:33:10 +00:00
|
|
|
return;
|
|
|
|
|
2013-03-18 16:34:57 +00:00
|
|
|
if (link->flag & NODE_LINK_VALID) {
|
2012-06-24 10:49:22 +00:00
|
|
|
/* special indicated link, on drop-node */
|
|
|
|
if (link->flag & NODE_LINKFLAG_HILITE) {
|
|
|
|
th_col1 = th_col2 = TH_ACTIVE;
|
|
|
|
}
|
2008-12-24 10:33:10 +00:00
|
|
|
else {
|
2012-06-24 10:49:22 +00:00
|
|
|
/* regular link */
|
|
|
|
if (link->fromnode && link->fromnode->flag & SELECT)
|
|
|
|
th_col1 = TH_EDGE_SELECT;
|
|
|
|
if (link->tonode && link->tonode->flag & SELECT)
|
|
|
|
th_col2 = TH_EDGE_SELECT;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2014-04-01 11:34:00 +11:00
|
|
|
do_shaded = true;
|
|
|
|
do_triple = true;
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2012-06-24 10:49:22 +00:00
|
|
|
else {
|
|
|
|
th_col1 = TH_REDALERT;
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-09 18:59:35 +00:00
|
|
|
node_draw_link_bezier(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
|
2011-09-05 21:01:50 +00:00
|
|
|
// node_draw_link_straight(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
|
2008-12-24 10:33:10 +00:00
|
|
|
}
|
2012-06-29 14:34:46 +00:00
|
|
|
|
2012-08-01 13:28:19 +00:00
|
|
|
void ED_node_draw_snap(View2D *v2d, const float cent[2], float size, NodeBorder border)
|
2012-06-29 14:34:46 +00:00
|
|
|
{
|
|
|
|
glBegin(GL_LINES);
|
|
|
|
|
|
|
|
if (border & (NODE_LEFT | NODE_RIGHT)) {
|
|
|
|
glVertex2f(cent[0], v2d->cur.ymin);
|
|
|
|
glVertex2f(cent[0], v2d->cur.ymax);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
glVertex2f(cent[0], cent[1] - size);
|
|
|
|
glVertex2f(cent[0], cent[1] + size);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (border & (NODE_TOP | NODE_BOTTOM)) {
|
|
|
|
glVertex2f(v2d->cur.xmin, cent[1]);
|
|
|
|
glVertex2f(v2d->cur.xmax, cent[1]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
glVertex2f(cent[0] - size, cent[1]);
|
|
|
|
glVertex2f(cent[0] + size, cent[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
glEnd();
|
|
|
|
}
|