Revision: 47959
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47959
Author: nazgul
Date: 2012-06-15 14:28:44 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
Merging r47949 through r47958 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47949
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47958
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_utils.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_select.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_armature_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_boid_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_brush_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_color_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_curve_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_force.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_packedFile_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_sound_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_tracking_types.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-47948
+
/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-47958
Modified: branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
2012-06-15 14:26:27 UTC (rev 47958)
+++ branches/soc-2011-tomato/source/blender/compositor/COM_defines.h
2012-06-15 14:28:44 UTC (rev 47959)
@@ -101,6 +101,8 @@
COM_TO_RULE_OF_THIRDS = 3
} OrderOfChunks;
+#define COM_ORDER_OF_CHUNKS_DEFAULT COM_TO_CENTER_OUT
+
#define COM_RULE_OF_THIRDS_DIVIDER 100.0f
#define COM_NUMBER_OF_CHANNELS 4
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
2012-06-15 14:26:27 UTC (rev 47958)
+++
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
2012-06-15 14:28:44 UTC (rev 47959)
@@ -229,7 +229,7 @@
NodeOperation *operation = this->getOutputNodeOperation();
float centerX = 0.5;
float centerY = 0.5;
- int chunkorder = COM_TO_CENTER_OUT;
+ OrderOfChunks chunkorder = COM_ORDER_OF_CHUNKS_DEFAULT;
if (operation->isViewerOperation()) {
ViewerBaseOperation *viewer = (ViewerBaseOperation*)operation;
Modified:
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
2012-06-15 14:26:27 UTC (rev 47958)
+++
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
2012-06-15 14:28:44 UTC (rev 47959)
@@ -38,10 +38,19 @@
ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
if (image1Socket->isConnected() && image2Socket->isConnected()) {
SplitViewerOperation *splitViewerOperation = new
SplitViewerOperation();
+
splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag
& R_COLOR_MANAGEMENT);
+
splitViewerOperation->setColorPredivide(context->getScene()->r.color_mgt_flag &
R_COLOR_MANAGEMENT_PREDIVIDE);
splitViewerOperation->setImage(image);
splitViewerOperation->setImageUser(imageUser);
splitViewerOperation->setActive((this->getbNode()->flag &
NODE_DO_OUTPUT) && this->isInActiveGroup());
splitViewerOperation->setSplitPercentage(this->getbNode()->custom1);
+
+ /* defaults - the viewer node has these options but not exposed
for split view
+ * we could use the split to define an area of interest on one
axis at least */
+
splitViewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT);
+ splitViewerOperation->setCenterX(0.5f);
+ splitViewerOperation->setCenterY(0.5f);
+
splitViewerOperation->setXSplit(!this->getbNode()->custom2);
image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0,
graph);
image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), 1,
graph);
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
2012-06-15 14:26:27 UTC (rev 47958)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
2012-06-15 14:28:44 UTC (rev 47959)
@@ -152,7 +152,7 @@
void GaussianBokehBlurOperation::deinitExecution()
{
BlurBaseOperation::deinitExecution();
- delete this->gausstab;
+ delete [] this->gausstab;
this->gausstab = NULL;
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
2012-06-15 14:26:27 UTC (rev 47958)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
2012-06-15 14:28:44 UTC (rev 47959)
@@ -110,7 +110,7 @@
void GaussianXBlurOperation::deinitExecution()
{
BlurBaseOperation::deinitExecution();
- delete this->gausstab;
+ delete [] this->gausstab;
this->gausstab = NULL;
}
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
2012-06-15 14:26:27 UTC (rev 47958)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
2012-06-15 14:28:44 UTC (rev 47959)
@@ -105,7 +105,7 @@
void GaussianYBlurOperation::deinitExecution()
{
BlurBaseOperation::deinitExecution();
- delete this->gausstab;
+ delete [] this->gausstab;
this->gausstab = NULL;
}
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-47948
+ /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-47958
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
2012-06-15 14:26:27 UTC (rev 47958)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
2012-06-15 14:28:44 UTC (rev 47959)
@@ -165,7 +165,8 @@
block = uiLayoutAbsoluteBlock(layout);
- scopes->track_preview_height = (scopes->track_preview_height <=
UI_UNIT_Y) ? UI_UNIT_Y : scopes->track_preview_height;
+ scopes->track_preview_height =
+ (scopes->track_preview_height <= UI_UNIT_Y) ? UI_UNIT_Y :
scopes->track_preview_height;
uiDefBut(block, TRACKPREVIEW, 0, "", rect.xmin, rect.ymin, rect.xmax -
rect.xmin,
scopes->track_preview_height, scopes, 0, 0, 0, 0, "");
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
2012-06-15 14:26:27 UTC (rev 47958)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
2012-06-15 14:28:44 UTC (rev 47959)
@@ -113,7 +113,7 @@
MovieClip *clip = CTX_data_edit_movieclip(C);
if (clip) {
- SpaceClip *sc= CTX_wm_space_clip(C);
+ SpaceClip *sc = CTX_wm_space_clip(C);
return sc->mask != NULL;
}
@@ -250,12 +250,12 @@
#endif
if (*aspx < *aspy) {
- *aspy= *aspy / *aspx;
- *aspx= 1.0f;
+ *aspy = *aspy / *aspx;
+ *aspx = 1.0f;
}
else {
- *aspx= *aspx / *aspy;
- *aspy= 1.0f;
+ *aspx = *aspx / *aspy;
+ *aspy = 1.0f;
}
}
@@ -297,12 +297,12 @@
*aspy *= (float)h;
if (*aspx < *aspy) {
- *aspy= *aspy / *aspx;
- *aspx= 1.0f;
+ *aspy = *aspy / *aspx;
+ *aspx = 1.0f;
}
else {
- *aspx= *aspx / *aspy;
- *aspy= 1.0f;
+ *aspx = *aspx / *aspy;
+ *aspy = 1.0f;
}
}
@@ -679,11 +679,11 @@
{
sc->mask = mask;
- if (sc->mask && sc->mask->id.us==0) {
+ if (sc->mask && sc->mask->id.us == 0) {
sc->clip->id.us = 1;
}
if (C) {
- WM_event_add_notifier(C, NC_MASK|NA_SELECTED, mask);
+ WM_event_add_notifier(C, NC_MASK | NA_SELECTED, mask);
}
}
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
2012-06-15 14:26:27 UTC (rev 47958)
+++
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
2012-06-15 14:28:44 UTC (rev 47959)
@@ -88,7 +88,8 @@
}
static void tracking_segment_point_cb(void *UNUSED(userdata),
MovieTrackingTrack *UNUSED(track),
- MovieTrackingMarker *UNUSED(marker), int
UNUSED(coord), int scene_framenr, float val)
+ MovieTrackingMarker *UNUSED(marker), int
UNUSED(coord),
+ int scene_framenr, float val)
{
glVertex2f(scene_framenr, val);
}
Modified:
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
