[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49083] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49067:49082
Campbell Barton
ideasman42 at gmail.com
Fri Jul 20 16:02:52 CEST 2012
Revision: 49083
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49083
Author: campbellbarton
Date: 2012-07-20 14:02:51 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49067:49082
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49067
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_fcurve.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49067
+ /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-49082
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c 2012-07-20 14:01:43 UTC (rev 49082)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c 2012-07-20 14:02:51 UTC (rev 49083)
@@ -71,7 +71,7 @@
* (ie: all verts of an edge selects the edge and so on).
* This should only be called by system and not tool authors.
*/
-void BM_mesh_select_mode_flush(BMesh *bm)
+void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
{
BMEdge *e;
BMLoop *l_iter;
@@ -83,7 +83,7 @@
int ok;
- if (bm->selectmode & SCE_SELECT_VERTEX) {
+ if (selectmode & SCE_SELECT_VERTEX) {
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
@@ -113,7 +113,7 @@
BM_elem_flag_set(f, BM_ELEM_SELECT, ok);
}
}
- else if (bm->selectmode & SCE_SELECT_EDGE) {
+ else if (selectmode & SCE_SELECT_EDGE) {
BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
ok = TRUE;
if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
@@ -139,6 +139,11 @@
recount_totsels(bm);
}
+void BM_mesh_select_mode_flush(BMesh *bm)
+{
+ BM_mesh_select_mode_flush_ex(bm, bm->selectmode);
+}
+
/**
* mode independent flushing up/down
*/
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h 2012-07-20 14:01:43 UTC (rev 49082)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h 2012-07-20 14:02:51 UTC (rev 49083)
@@ -60,6 +60,7 @@
void BM_face_select_set(BMesh *bm, BMFace *f, int select);
void BM_mesh_select_mode_set(BMesh *bm, int selectmode);
+void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode);
void BM_mesh_select_mode_flush(BMesh *bm);
void BM_mesh_deselect_flush(BMesh *bm);
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp 2012-07-20 14:01:43 UTC (rev 49082)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.cpp 2012-07-20 14:02:51 UTC (rev 49083)
@@ -30,7 +30,6 @@
#include "DNA_scene_types.h"
-
#ifdef USE_RASKTER
extern "C" {
@@ -140,13 +139,10 @@
this->m_maskHeight = 0;
this->m_framenumber = 0;
this->m_rasterMaskHandle = NULL;
- setComplex(true);
}
void MaskOperation::initExecution()
{
- initMutex();
-
if (this->m_mask) {
if (this->m_rasterMaskHandle == NULL) {
const int width = this->getWidth();
@@ -165,16 +161,8 @@
BKE_maskrasterize_handle_free(this->m_rasterMaskHandle);
this->m_rasterMaskHandle = NULL;
}
-
- deinitMutex();
}
-void *MaskOperation::initializeTileData(rcti *rect)
-{
- /* pass */
- return NULL;
-}
-
void MaskOperation::determineResolution(unsigned int resolution[], unsigned int preferredResolution[])
{
if (this->m_maskWidth == 0 || this->m_maskHeight == 0) {
@@ -193,7 +181,7 @@
}
}
-void MaskOperation::executePixel(float *color, int x, int y, void *data)
+void MaskOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
{
const float xy[2] = {x / (float)this->m_maskWidth, y / (float)this->m_maskHeight};
if (this->m_rasterMaskHandle) {
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h 2012-07-20 14:01:43 UTC (rev 49082)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_MaskOperation.h 2012-07-20 14:02:51 UTC (rev 49083)
@@ -72,7 +72,6 @@
void initExecution();
void deinitExecution();
- void *initializeTileData(rcti *rect);
void setMask(Mask *mask) { this->m_mask = mask; }
void setMaskWidth(int width) { this->m_maskWidth = width; }
@@ -81,7 +80,12 @@
void setSmooth(bool smooth) { this->m_do_smooth = smooth; }
void setFeather(bool feather) { this->m_do_feather = feather; }
+#ifdef USE_RASKTER
+ void *initializeTileData(rcti *rect);
void executePixel(float *color, int x, int y, void *data);
+#else /* USE_RASKTER */
+ void executePixel(float *color, float x, float y, PixelSampler sampler);
+#endif /* USE_RASKTER */
};
#endif
Modified: branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp 2012-07-20 14:01:43 UTC (rev 49082)
+++ branches/soc-2011-tomato/source/blender/compositor/operations/COM_MixBaseOperation.cpp 2012-07-20 14:02:51 UTC (rev 49083)
@@ -32,6 +32,7 @@
this->m_inputColor1Operation = NULL;
this->m_inputColor2Operation = NULL;
this->setUseValueAlphaMultiply(false);
+ this->setUseClamp(false);
}
void MixBaseOperation::initExecution()
Modified: branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c 2012-07-20 14:01:43 UTC (rev 49082)
+++ branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c 2012-07-20 14:02:51 UTC (rev 49083)
@@ -2507,11 +2507,11 @@
acf_generic_channel_backdrop, /* backdrop */
acf_generic_indention_flexible, /* indent level */
acf_generic_group_offset, /* offset */
-
+
acf_gpl_name, /* name */
acf_gpl_name_prop, /* name prop */
NULL, /* icon */
-
+
acf_gpl_setting_valid, /* has setting */
acf_gpl_setting_flag, /* flag for setting */
acf_gpl_setting_ptr /* pointer for setting */
@@ -2541,7 +2541,7 @@
case ACHANNEL_SETTING_SELECT:
case ACHANNEL_SETTING_EXPAND:
return 1;
-
+
default:
return 0;
}
@@ -2552,15 +2552,15 @@
{
/* clear extra return data first */
*neg = 0;
-
+
switch (setting) {
case ACHANNEL_SETTING_SELECT: /* selected */
return AGRP_SELECTED;
-
+
case ACHANNEL_SETTING_EXPAND: /* expanded */
return MASK_ANIMF_EXPAND;
}
-
+
/* this shouldn't happen */
return 0;
}
@@ -2569,7 +2569,7 @@
static void *acf_mask_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type)
{
Mask *mask = (Mask *)ale->data;
-
+
/* all flags are just in mask->flag for now... */
return GET_ACF_FLAG_PTR(mask->flag, type);
}
@@ -2578,16 +2578,16 @@
static bAnimChannelType ACF_MASKDATA =
{
"Mask Datablock", /* type name */
-
+
acf_mask_color, /* backdrop color */
acf_group_backdrop, /* backdrop */
acf_generic_indention_0, /* indent level */
acf_generic_group_offset, /* offset */
-
+
acf_generic_idblock_name, /* name */
acf_generic_idfill_nameprop, /* name prop */
acf_mask_icon, /* icon */
-
+
acf_mask_setting_valid, /* has setting */
acf_mask_setting_flag, /* flag for setting */
acf_mask_setting_ptr /* pointer for setting */
@@ -2599,7 +2599,7 @@
static void acf_masklay_name(bAnimListElem *ale, char *name)
{
MaskLayer *masklay = (MaskLayer *)ale->data;
-
+
if (masklay && name)
BLI_strncpy(name, masklay->name, ANIM_CHAN_NAME_SIZE);
}
@@ -2610,7 +2610,7 @@
if (ale->data) {
RNA_pointer_create(ale->id, &RNA_MaskLayer, ale->data, ptr);
*prop = RNA_struct_name_property(ptr->type);
-
+
return (*prop != NULL);
}
@@ -2625,7 +2625,7 @@
case ACHANNEL_SETTING_EXPAND: /* mask layers are more like F-Curves than groups */
case ACHANNEL_SETTING_VISIBLE: /* graph editor only */
return 0;
-
+
/* always available */
default:
return 1;
@@ -2637,18 +2637,18 @@
{
/* clear extra return data first */
*neg = 0;
-
+
switch (setting) {
case ACHANNEL_SETTING_SELECT: /* selected */
return MASK_LAYERFLAG_SELECT;
-
+
// case ACHANNEL_SETTING_MUTE: /* muted */
// return GP_LAYER_HIDE;
-
+
case ACHANNEL_SETTING_PROTECT: /* protected */
// *neg = 1; - if we change this to edtiability
return MASK_LAYERFLAG_LOCKED;
-
+
default: /* unsupported */
return 0;
}
@@ -2702,17 +2702,17 @@
animchannelTypeInfo[type++] = NULL; /* None */
animchannelTypeInfo[type++] = NULL; /* AnimData */
animchannelTypeInfo[type++] = NULL; /* Special */
-
+
animchannelTypeInfo[type++] = &ACF_SUMMARY; /* Motion Summary */
-
+
animchannelTypeInfo[type++] = &ACF_SCENE; /* Scene */
animchannelTypeInfo[type++] = &ACF_OBJECT; /* Object */
animchannelTypeInfo[type++] = &ACF_GROUP; /* Group */
animchannelTypeInfo[type++] = &ACF_FCURVE; /* F-Curve */
-
+
animchannelTypeInfo[type++] = &ACF_FILLACTD; /* Object Action Expander */
animchannelTypeInfo[type++] = &ACF_FILLDRIVERS; /* Drivers Expander */
-
+
animchannelTypeInfo[type++] = &ACF_DSMAT; /* Material Channel */
animchannelTypeInfo[type++] = &ACF_DSLAM; /* Lamp Channel */
animchannelTypeInfo[type++] = &ACF_DSCAM; /* Camera Channel */
@@ -2727,15 +2727,15 @@
animchannelTypeInfo[type++] = &ACF_DSTEX; /* Texture Channel */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list