[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47254] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47229:47253
Campbell Barton
ideasman42 at gmail.com
Thu May 31 09:57:04 CEST 2012
Revision: 47254
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47254
Author: campbellbarton
Date: 2012-05-31 07:57:04 +0000 (Thu, 31 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47229:47253
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47229
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/render/graph.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
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-47229
+ /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-47253
Modified: branches/soc-2011-tomato/intern/cycles/render/graph.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/graph.cpp 2012-05-31 07:55:04 UTC (rev 47253)
+++ branches/soc-2011-tomato/intern/cycles/render/graph.cpp 2012-05-31 07:57:04 UTC (rev 47254)
@@ -340,7 +340,8 @@
foreach(ShaderInput *input, inputs) {
disconnect(input);
- connect(output, input);
+ if (output)
+ connect(output, input);
}
}
}
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-05-31 07:55:04 UTC (rev 47253)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-05-31 07:57:04 UTC (rev 47254)
@@ -27,18 +27,12 @@
/** \file ghost/intern/GHOST_SystemWin32.cpp
* \ingroup GHOST
+ *
+ * \author Maarten Gribnau
*/
-
-/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
- * @author Maarten Gribnau
- * @date May 7, 2001
- */
-
-#ifdef BF_GHOST_DEBUG
-#include <iostream>
+#ifdef WITH_GHOST_DEBUG
+# include <iostream>
#endif
#include <stdio.h> // [mce] temporary debug, remove soon!
@@ -47,18 +41,19 @@
#include "GHOST_EventDragnDrop.h"
#ifndef _WIN32_IE
-#define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */
+# define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */
#endif
+
#include <shlobj.h>
#include <tlhelp32.h>
// win64 doesn't define GWL_USERDATA
#ifdef WIN32
-#ifndef GWL_USERDATA
-#define GWL_USERDATA GWLP_USERDATA
-#define GWL_WNDPROC GWLP_WNDPROC
+# ifndef GWL_USERDATA
+# define GWL_USERDATA GWLP_USERDATA
+# define GWL_WNDPROC GWLP_WNDPROC
+# endif
#endif
-#endif
#include "utfconv.h"
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp 2012-05-31 07:55:04 UTC (rev 47253)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp 2012-05-31 07:57:04 UTC (rev 47254)
@@ -232,11 +232,10 @@
context = NULL;
program = NULL;
if (clCreateContextFromType) {
- cl_uint numberOfPlatforms;
+ cl_uint numberOfPlatforms = 0;
cl_int error;
error = clGetPlatformIDs(0, 0, &numberOfPlatforms);
if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
- numberOfPlatforms = 0;
if (G.f & G_DEBUG) printf("%d number of platforms\n", numberOfPlatforms);
cl_platform_id *platforms = new cl_platform_id[numberOfPlatforms];
error = clGetPlatformIDs(numberOfPlatforms, platforms, 0);
@@ -265,7 +264,7 @@
error = clBuildProgram(program, totalNumberOfDevices, cldevices, 0, 0, 0);
if (error != CL_SUCCESS) {
cl_int error2;
- size_t ret_val_size;
+ size_t ret_val_size = 0;
printf("CLERROR[%d]: %s\n", error, clewErrorString(error));
error2 = clGetProgramBuildInfo(program, cldevices[0], CL_PROGRAM_BUILD_LOG, 0, NULL, &ret_val_size);
if (error2 != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
@@ -276,19 +275,20 @@
printf("%s", build_log);
delete build_log;
- }
- unsigned int indexDevices;
- for (indexDevices = 0 ; indexDevices < totalNumberOfDevices ; indexDevices ++) {
- cl_device_id device = cldevices[indexDevices];
- OpenCLDevice *clDevice = new OpenCLDevice(context, device, program);
- clDevice->initialize(),
- gpudevices.push_back(clDevice);
- if (G.f & G_DEBUG) {
- char resultString[32];
- error = clGetDeviceInfo(device, CL_DEVICE_NAME, 32, resultString, 0);
- printf("OPENCL_DEVICE: %s, ", resultString);
- error = clGetDeviceInfo(device, CL_DEVICE_VENDOR, 32, resultString, 0);
- printf("%s\n", resultString);
+ } else {
+ unsigned int indexDevices;
+ for (indexDevices = 0 ; indexDevices < totalNumberOfDevices ; indexDevices ++) {
+ cl_device_id device = cldevices[indexDevices];
+ OpenCLDevice *clDevice = new OpenCLDevice(context, device, program);
+ clDevice->initialize(),
+ gpudevices.push_back(clDevice);
+ if (G.f & G_DEBUG) {
+ char resultString[32];
+ error = clGetDeviceInfo(device, CL_DEVICE_NAME, 32, resultString, 0);
+ printf("OPENCL_DEVICE: %s, ", resultString);
+ error = clGetDeviceInfo(device, CL_DEVICE_VENDOR, 32, resultString, 0);
+ printf("%s\n", resultString);
+ }
}
}
}
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-47229
+ /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-47253
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-47229
+ /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-47253
More information about the Bf-blender-cvs
mailing list