[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49463] branches/soc-2011-tomato: Merging r49451 through r49462 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 1 17:05:42 CEST 2012
Revision: 49463
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49463
Author: nazgul
Date: 2012-08-01 15:05:42 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Merging r49451 through r49462 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49451
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49462
Modified Paths:
--------------
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc
branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.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_MovieClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TextureOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.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-49450
+ /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-49462
Modified: branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc 2012-08-01 15:05:42 UTC (rev 49463)
@@ -209,7 +209,7 @@
if( ix >= width-2 ) ix = width-2;
if( iy >= height-2 ) iy = height-2;
- Offset offset = { ix-x, iy-y, fx, fy };
+ Offset offset = { (short)(ix-x), (short)(iy-y), (unsigned char)fx, (unsigned char)fy };
grid->offset[y*width+x] = offset;
}
}
Modified: branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc
===================================================================
--- branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/extern/libmv/libmv/simple_pipeline/detect.cc 2012-08-01 15:05:42 UTC (rev 49463)
@@ -66,7 +66,7 @@
Feature *all_features = new Feature[num_features];
for(int i = 0; i < num_features; ++i) {
- Feature a = { nonmax[i].x, nonmax[i].y, scores[i], 0 };
+ Feature a = { (float)nonmax[i].x, (float)nonmax[i].y, (float)scores[i], 0 };
all_features[i] = a;
}
@@ -173,7 +173,7 @@
for(int y=16; y<height-16; y++) {
for(int x=16; x<width-16; x++) {
int s = scores[y*width+x];
- Feature f = { x+8, y+8, s, 16 };
+ Feature f = { (float)x+8.0f, (float)y+8.0f, (float)s, 16 };
if(s>min) detected[i++] = f;
}
}
Modified: branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -301,15 +301,12 @@
{
string build_options = " -cl-fast-relaxed-math ";
- /* Multi Closure for nVidia cards */
if(platform_name == "NVIDIA CUDA")
build_options += "-D__KERNEL_SHADING__ -D__KERNEL_OPENCL_NVIDIA__ -cl-nv-maxrregcount=24 -cl-nv-verbose ";
-
- /* No Float3 for Apple */
+
else if(platform_name == "Apple")
build_options += "-D__CL_NO_FLOAT3__ -D__KERNEL_OPENCL_APPLE__ ";
-
- /* Basic shading for AMD cards (non Apple) */
+
else if(platform_name == "AMD Accelerated Parallel Processing")
build_options += "-D__CL_NO_FLOAT3__ -D__KERNEL_OPENCL_AMD__ ";
Modified: branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c 2012-08-01 15:05:42 UTC (rev 49463)
@@ -644,7 +644,7 @@
MEM_printmemlist_internal(1);
}
-short MEM_freeN(void *vmemh) /* anders compileertie niet meer */
+short MEM_freeN(void *vmemh)
{
short error = 0;
MemTail *memt;
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_BilateralBlurNode.h"
-#include "DNA_scene_types.h"
#include "DNA_node_types.h"
#include "COM_ExecutionSystem.h"
#include "COM_BilateralBlurOperation.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BlurNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_BlurNode.h"
-#include "DNA_scene_types.h"
#include "DNA_node_types.h"
#include "COM_GaussianXBlurOperation.h"
#include "COM_GaussianYBlurOperation.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehBlurNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_BokehBlurNode.h"
-#include "DNA_scene_types.h"
#include "DNA_camera_types.h"
#include "DNA_object_types.h"
#include "DNA_node_types.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BokehImageNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_BokehImageNode.h"
-#include "DNA_scene_types.h"
#include "COM_BokehImageOperation.h"
#include "COM_ExecutionSystem.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BoxMaskNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BoxMaskNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_BoxMaskNode.h"
-#include "DNA_scene_types.h"
#include "COM_BoxMaskOperation.h"
#include "COM_ExecutionSystem.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BrightnessNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BrightnessNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_BrightnessNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_BrightnessNode.h"
-#include "DNA_scene_types.h"
#include "COM_BrightnessOperation.h"
#include "COM_ExecutionSystem.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_ColorCorrectionNode.h"
-#include "DNA_scene_types.h"
#include "COM_ColorCorrectionOperation.h"
#include "COM_ExecutionSystem.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorCurveNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_ColorCurveNode.h"
-#include "DNA_scene_types.h"
#include "COM_ColorCurveOperation.h"
#include "COM_ExecutionSystem.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_ColorNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
#include "COM_ColorNode.h"
-#include "DNA_scene_types.h"
#include "COM_SetColorOperation.h"
#include "COM_ExecutionSystem.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_CompositorNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -38,7 +38,7 @@
InputSocket *depthSocket = this->getInputSocket(2);
CompositorOperation *compositorOperation = new CompositorOperation();
- compositorOperation->setScene((Scene *) editorNode->id);
+ compositorOperation->setSceneName(editorNode->id->name);
compositorOperation->setRenderData(context->getRenderData());
compositorOperation->setbNodeTree(context->getbNodeTree());
imageSocket->relinkConnections(compositorOperation->getInputSocket(0), 0, graph);
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp 2012-08-01 15:04:10 UTC (rev 49462)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp 2012-08-01 15:05:42 UTC (rev 49463)
@@ -21,7 +21,6 @@
*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list