Revision: 46549
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46549
Author: blendix
Date: 2012-05-11 12:50:05 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Tiles branch:
* Fix OpenCL not being found on Mac OS X.
* Fix merge error in tracking.c
* Node/RNA naming capitalization and underscore consistency.
* Add missing license headers in opencl files.
* Remove unneeded COM_defines.h.trunk file.
* Various code style consistency fixes.
Modified Paths:
--------------
branches/tile/source/blender/blenkernel/intern/tracking.c
branches/tile/source/blender/blenlib/BLI_math_base.h
branches/tile/source/blender/blenloader/intern/readfile.c
branches/tile/source/blender/editors/space_node/drawnode.c
branches/tile/source/blender/makesdna/DNA_node_types.h
branches/tile/source/blender/makesrna/intern/rna_nodetree.c
branches/tile/source/blender/nodes/CMakeLists.txt
branches/tile/source/blender/nodes/NOD_composite.h
branches/tile/source/blender/nodes/composite/node_composite_tree.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_image.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_sampler.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/tile/source/blender/opencl/OCL_opencl.h
branches/tile/source/blender/opencl/intern/OCL_opencl.c
branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/tile/source/creator/creator.c
Removed Paths:
-------------
branches/tile/source/blender/compositor/COM_defines.h.trunk
Modified: branches/tile/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/tile/source/blender/blenkernel/intern/tracking.c 2012-05-11
11:35:24 UTC (rev 46548)
+++ branches/tile/source/blender/blenkernel/intern/tracking.c 2012-05-11
12:50:05 UTC (rev 46549)
@@ -975,8 +975,8 @@
context->clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS;
context->user= *user;
- context->user.render_size= 0;
- context->user.render_flag= MCLIP_PROXY_RENDER_SIZE_FULL;
+ context->user.render_size= MCLIP_PROXY_RENDER_SIZE_FULL;
+ context->user.render_flag= 0;
if(!sequence)
BLI_begin_threaded_malloc();
Modified: branches/tile/source/blender/blenlib/BLI_math_base.h
===================================================================
--- branches/tile/source/blender/blenlib/BLI_math_base.h 2012-05-11
11:35:24 UTC (rev 46548)
+++ branches/tile/source/blender/blenlib/BLI_math_base.h 2012-05-11
12:50:05 UTC (rev 46549)
@@ -78,10 +78,10 @@
#endif
#ifndef sqrtf
-#define sqrtf(a) ((float)sqrt((float)a))
+#define sqrtf(a) ((float)sqrt((float)(a)))
#endif
#ifndef powf
-#define powf(a, b) ((float)pow((float)a, (float)b))
+#define powf(a, b) ((float)pow((float)(a), (float)(b)))
#endif
#ifndef cosf
#define cosf(a) ((float)cos(a))
Modified: branches/tile/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/tile/source/blender/blenloader/intern/readfile.c 2012-05-11
11:35:24 UTC (rev 46548)
+++ branches/tile/source/blender/blenloader/intern/readfile.c 2012-05-11
12:50:05 UTC (rev 46549)
@@ -13052,30 +13052,37 @@
}
}
}
+
{
- // composite redesign
- Scene *scene;
- bNode *node;
- for (scene=main->scene.first; scene; scene=scene->id.next)
- if (scene->nodetree)
- for (node=scene->nodetree->nodes.first; node;
node=node->next)
- if (node->type==CMP_NODE_R_LAYERS) {
- NodeRenderlayerData *data=
node->storage;
- if (!data) {
- data =
MEM_callocN(sizeof(NodeRenderlayerData), "NodeRenderLayerData");
- data->angle = 0.0f;
- data->offsetx = 0.0f;
- data->offsety = 0.0f;
- data->scalex = 1.0f;
- data->scaley = 1.0f;
- node->storage = data;
+ /* composite redesign */
+ Scene *scene;
+ bNode *node;
+
+ for (scene = main->scene.first; scene; scene =
scene->id.next) {
+ if (scene->nodetree) {
+ for (node =
scene->nodetree->nodes.first; node; node = node->next) {
+ if
(node->type==CMP_NODE_R_LAYERS) {
+ NodeRenderlayerData
*data = node->storage;
+
+ if (!data) {
+ data =
MEM_callocN(sizeof(NodeRenderlayerData), "NodeRenderLayerData");
+ data->angle =
0.0f;
+ data->offsetx =
0.0f;
+ data->offsety =
0.0f;
+ data->scalex =
1.0f;
+ data->scaley =
1.0f;
+ node->storage =
data;
+ }
}
}
- for (scene=main->scene.first; scene; scene=scene->id.next)
- if (scene->nodetree)
- if ( scene->nodetree->chunksize == 0) {
- scene->nodetree->chunksize = 256;
+
+ if (scene->nodetree->chunksize == 0) {
+ scene->nodetree->chunksize =
256;
+ scene->nodetree->edit_quality =
NTREE_QUALITY_HIGH;
+ scene->nodetree->render_quality
= NTREE_QUALITY_HIGH;
+ }
}
+ }
}
}
Deleted: branches/tile/source/blender/compositor/COM_defines.h.trunk
===================================================================
--- branches/tile/source/blender/compositor/COM_defines.h.trunk 2012-05-11
11:35:24 UTC (rev 46548)
+++ branches/tile/source/blender/compositor/COM_defines.h.trunk 2012-05-11
12:50:05 UTC (rev 46549)
@@ -1,101 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * 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,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor:
- * Jeroen Bakker
- * Monique Dewanchand
- */
-
-#ifndef _COM_defines_h_
-#define _COM_defines_h_
-
-/**
- * @brief possible data types for SocketConnection
- * @ingroup Model
- */
-typedef enum DataType {
- /** @brief Unknown data type (or not yet known) */
- COM_DT_UNKNOWN = 0,
- /** @brief Value data type */
- COM_DT_VALUE = 1,
- /** @brief Vector data type */
- COM_DT_VECTOR = 2,
- /** @brief Color data type */
- COM_DT_COLOR = 4
-} DataType;
-
-/**
- * @brief Possible quality settings
- * @see CompositorContext.quality
- * @ingroup Execution
- */
-typedef enum CompositorQuality {
- /** @brief High quality setting */
- COM_QUALITY_HIGH = 0 ,
- /** @brief Medium quality setting */
- COM_QUALITY_MEDIUM = 1,
- /** @brief Low quality setting */
- COM_QUALITY_LOW = 2
-} CompositorQuality;
-
-// configurable items
-
-// chunk size determination
-#define COM_PREVIEW_SIZE 140.0f
-#define COM_OPENCL_ENABLED
-#define COM_PREVIEW_ENABLED
-// workscheduler threading models
-/**
- * COM_TM_QUEUE is a multithreaded model, which uses the BLI_thread_queue
pattern. This is the default option.
- */
-#define COM_TM_QUEUE 1
-
-/**
- * COM_TM_NOTHREAD is a single threading model, everything is executed in the
caller thread. easy for debugging
- */
-#define COM_TM_NOTHREAD 0
-
-/**
- * COM_CURRENT_THREADING_MODEL can be one of the above, COM_TM_QUEUE is
currently default.
- */
-#define COM_CURRENT_THREADING_MODEL COM_TM_QUEUE
-// chunk order
-/**
- * @brief The order of chunks to be scheduled
- * @ingroup Execution
- */
-typedef enum OrderOfChunks {
- /** @brief order from a distance to centerX/centerY */
- COM_TO_CENTER_OUT = 0,
- /** @brief order randomly */
- COM_TO_RANDOM = 1,
- /** @brief no ordering */
- COM_TO_TOP_DOWN = 2,
- /** @brief experimental ordering with 9 hotspots */
- COM_TO_RULE_OF_THIRDS = 3
-} OrderOfChunks;
-
-#define COM_RULE_OF_THIRDS_DIVIDER 100.0f
-
-#define COM_NUMBER_OF_CHANNELS 4
-
-#define COM_DEFAULT_RESOLUTION_WIDTH 640
-#define COM_DEFAULT_RESOLUTION_HEIGHT 480
-
-#define COM_TRUNK 1
-
-#endif
Modified: branches/tile/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/tile/source/blender/editors/space_node/drawnode.c 2012-05-11
11:35:24 UTC (rev 46548)
+++ branches/tile/source/blender/editors/space_node/drawnode.c 2012-05-11
12:50:05 UTC (rev 46549)
@@ -1715,6 +1715,7 @@
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 = uiLayoutRow(layout, 0);
uiItemR(row, ptr, "midtones_start", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "midtones_end", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
@@ -1725,24 +1726,28 @@
uiItemR(row, ptr, "master_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "master_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "master_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+
row = uiLayoutRow(layout, 0);
uiItemL(row, "Saturation", 0);
uiItemL(row, "Contrast", 0);
uiItemL(row, "Gamma", 0);
uiItemL(row, "Gain", 0);
uiItemL(row, "Lift", 0);
+
row = uiLayoutRow(layout, 0);
uiItemR(row, ptr, "highlights_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "highlights_contrast", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "highlights_gamma", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "highlights_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "highlights_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+
row = uiLayoutRow(layout, 0);
uiItemR(row, ptr, "midtones_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "midtones_contrast", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "midtones_gamma", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "midtones_gain", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(row, ptr, "midtones_lift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
+
row = uiLayoutRow(layout, 0);
uiItemR(row, ptr, "shadows_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
uiItemR(row, ptr, "shadows_contrast", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
@@ -1757,6 +1762,7 @@
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;
uiItemL(row, "Saturation", 0);
uiItemR(row, ptr, "master_saturation", UI_ITEM_R_SLIDER, NULL,
ICON_NONE);
@@ -1919,6 +1925,7 @@
{
uiItemR(layout, ptr, "check", 0, NULL, ICON_NONE);
}
+
static void node_composit_buts_boxmask(uiLayout *layout, bContext *UNUSED(C),
PointerRNA *ptr)
{
uiLayout *row;
@@ -1943,6 +1950,7 @@
uiItemR(layout, ptr, "catadioptric", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
uiItemR(layout, ptr, "shift", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
}
+
void node_composit_backdrop_viewer(SpaceNode* snode, ImBuf* backdrop, bNode*
node, int x, int y) {
// node_composit_backdrop_canvas(snode, backdrop, node, x, y);
if (node->custom1 == 0) { /// @todo: why did we need this one?
@@ -1966,7 +1974,8 @@
// node_composit_backdrop_canvas(snode, backdrop, node, x, y);
//}
-void node_composit_backdrop_boxmask(SpaceNode* snode, ImBuf* backdrop, bNode*
node, int x, int y) {
+void node_composit_backdrop_boxmask(SpaceNode* snode, ImBuf* backdrop, bNode*
node, int x, int y)
+{
NodeBoxMask * boxmask = node->storage;
const float backdropWidth = backdrop->x;
const float backdropHeight = backdrop->y;
@@ -2005,7 +2014,9 @@
glVertex2f(x4, y4);
glEnd();
}
-void node_composit_backdrop_ellipsemask(SpaceNode* snode, ImBuf* backdrop,
bNode* node, int x, int y) {
+
+void node_composit_backdrop_ellipsemask(SpaceNode* snode, ImBuf* backdrop,
bNode* node, int x, int y)
+{
NodeEllipseMask * ellipsemask = node->storage;
const float backdropWidth = backdrop->x;
const float backdropHeight = backdrop->y;
@@ -2049,9 +2060,11 @@
static void node_composit_buts_ellipsemask(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *ptr)
{
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
