Revision: 50144
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50144
Author: campbellbarton
Date: 2012-08-23 07:14:53 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50138:50143
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50138
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DespeckleOperation.cpp
branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
branches/soc-2011-tomato/source/blender/imbuf/IMB_thumbs.h
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_despeckle.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBuff.cpp
branches/soc-2011-tomato/source/gameengine/VideoTexture/ImageBuff.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50138
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50143
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
2012-08-23 07:10:48 UTC (rev 50143)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
2012-08-23 07:14:53 UTC (rev 50144)
@@ -146,7 +146,7 @@
/// Additional parameters in the side panel.
void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct
PointerRNA *ptr);
/// Additional drawing on backdrop.
- void (*uibackdropfunc)(struct SpaceNode* snode, struct ImBuf* backdrop,
struct bNode* node, int x, int y);
+ void (*uibackdropfunc)(struct SpaceNode *snode, struct ImBuf *backdrop,
struct bNode *node, int x, int y);
/// Draw a node socket. Default draws the input value button.
NodeSocketButtonFunction drawinputfunc;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
2012-08-23 07:10:48 UTC (rev 50143)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
2012-08-23 07:14:53 UTC (rev 50144)
@@ -380,7 +380,7 @@
void (*copy_data) (struct SequenceModifierData *smd, struct
SequenceModifierData *target);
/* apply modifier on a given image buffer */
- struct ImBuf* (*apply) (struct SequenceModifierData *smd, struct ImBuf
*ibuf, struct ImBuf *mask);
+ struct ImBuf *(*apply) (struct SequenceModifierData *smd, struct ImBuf
*ibuf, struct ImBuf *mask);
} SequenceModifierTypeInfo;
struct SequenceModifierTypeInfo *BKE_sequence_modifier_type_info_get(int type);
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DespeckleOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DespeckleOperation.cpp
2012-08-23 07:10:48 UTC (rev 50143)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DespeckleOperation.cpp
2012-08-23 07:14:53 UTC (rev 50144)
@@ -128,8 +128,8 @@
bool DespeckleOperation::determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation, rcti *output)
{
rcti newInput;
- int addx = 1; //(this->m_filterWidth - 1) / 2 + 1;
- int addy = 1; //(this->m_filterHeight - 1) / 2 + 1;
+ int addx = 2; //(this->m_filterWidth - 1) / 2 + 1;
+ int addy = 2; //(this->m_filterHeight - 1) / 2 + 1;
newInput.xmax = input->xmax + addx;
newInput.xmin = input->xmin - addx;
newInput.ymax = input->ymax + addy;
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50138
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50143
Property changes on:
branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50138
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50143
Modified: branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
2012-08-23 07:10:48 UTC (rev 50143)
+++ branches/soc-2011-tomato/source/blender/imbuf/IMB_moviecache.h
2012-08-23 07:14:53 UTC (rev 50144)
@@ -58,7 +58,7 @@
MovieCachePriorityDeleterFP
prioritydeleterfp);
void IMB_moviecache_put(struct MovieCache *cache, void *userkey, struct ImBuf
*ibuf);
-struct ImBuf* IMB_moviecache_get(struct MovieCache *cache, void *userkey);
+struct ImBuf *IMB_moviecache_get(struct MovieCache *cache, void *userkey);
void IMB_moviecache_free(struct MovieCache *cache);
void IMB_moviecache_cleanup(struct MovieCache *cache, int (cleanup_check_cb)
(void *userkey, void *userdata), void *userdata);
Modified: branches/soc-2011-tomato/source/blender/imbuf/IMB_thumbs.h
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/IMB_thumbs.h 2012-08-23
07:10:48 UTC (rev 50143)
+++ branches/soc-2011-tomato/source/blender/imbuf/IMB_thumbs.h 2012-08-23
07:14:53 UTC (rev 50144)
@@ -63,16 +63,16 @@
// IB_metadata
/* create thumbnail for file and returns new imbuf for thumbnail */
-ImBuf* IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source,
ImBuf *ibuf);
+ImBuf *IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source,
ImBuf *ibuf);
/* read thumbnail for file and returns new imbuf for thumbnail */
-ImBuf* IMB_thumb_read(const char* path, ThumbSize size);
+ImBuf *IMB_thumb_read(const char* path, ThumbSize size);
/* delete all thumbs for the file */
void IMB_thumb_delete(const char* path, ThumbSize size);
/* return the state of the thumb, needed to determine how to manage the thumb
*/
-ImBuf* IMB_thumb_manage(const char* path, ThumbSize size, ThumbSource source);
+ImBuf *IMB_thumb_manage(const char* path, ThumbSize size, ThumbSource source);
/* create the necessary dirs to store the thumbnails */
void IMB_thumb_makedirs(void);
Modified:
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
===================================================================
---
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
2012-08-23 07:10:48 UTC (rev 50143)
+++
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
2012-08-23 07:14:53 UTC (rev 50144)
@@ -795,13 +795,13 @@
void ntreeCompositForceHidden(bNodeTree *ntree, Scene *curscene)
{
bNode *node;
-
- if (ntree==NULL) return;
-
- for (node= ntree->nodes.first; node; node= node->next) {
- if ( node->type==CMP_NODE_R_LAYERS) {
- Scene *sce= node->id?(Scene *)node->id:curscene;
- SceneRenderLayer *srl= BLI_findlink(&sce->r.layers,
node->custom1);
+
+ if (ntree == NULL) return;
+
+ for (node = ntree->nodes.first; node; node = node->next) {
+ if (node->type == CMP_NODE_R_LAYERS) {
+ Scene *sce = node->id ? (Scene *)node->id : curscene;
+ SceneRenderLayer *srl = BLI_findlink(&sce->r.layers,
node->custom1);
if (srl)
force_hidden_passes(node, srl->passflag);
}
@@ -809,7 +809,7 @@
* Updates should only happen when actually necessary.
*/
#if 0
- else if ( node->type==CMP_NODE_IMAGE) {
+ else if (node->type == CMP_NODE_IMAGE) {
nodeUpdate(ntree, node);
}
#endif
@@ -822,15 +822,15 @@
void ntreeCompositTagRender(Scene *curscene)
{
Scene *sce;
-
- for (sce= G.main->scene.first; sce; sce= sce->id.next) {
+
+ for (sce = G.main->scene.first; sce; sce = sce->id.next) {
if (sce->nodetree) {
bNode *node;
-
- for (node= sce->nodetree->nodes.first; node; node=
node->next) {
- if (node->id==(ID *)curscene ||
node->type==CMP_NODE_COMPOSITE)
+
+ for (node = sce->nodetree->nodes.first; node; node =
node->next) {
+ if (node->id == (ID *)curscene || node->type ==
CMP_NODE_COMPOSITE)
nodeUpdate(sce->nodetree, node);
- else if (node->type==CMP_NODE_TEXTURE) /* uses
scene sizex/sizey */
+ else if (node->type == CMP_NODE_TEXTURE) /*
uses scene sizex/sizey */
nodeUpdate(sce->nodetree, node);
}
}
@@ -844,37 +844,37 @@
Link *link;
PointerRNA ptr;
PropertyRNA *prop;
-
+
/* check to see if any of the node's properties have fcurves */
RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
lb = RNA_struct_type_properties(ptr.type);
-
- for (link=lb->first; link; link=link->next) {
- int driven, len=1, index;
+
+ for (link = lb->first; link; link = link->next) {
+ int driven, len = 1, index;
prop = (PropertyRNA *)link;
-
+
if (RNA_property_array_check(prop))
len = RNA_property_array_length(&ptr, prop);
-
- for (index=0; index<len; index++) {
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
