[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47071] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47067:47070
Campbell Barton
ideasman42 at gmail.com
Sun May 27 14:23:20 CEST 2012
Revision: 47071
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47071
Author: campbellbarton
Date: 2012-05-27 12:23:20 +0000 (Sun, 27 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47067:47070
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47067
Modified Paths:
--------------
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Debug.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_base.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2011-tomato/source/blender/blenpluginapi/util.h
branches/soc-2011-tomato/source/blender/editors/armature/reeb.c
branches/soc-2011-tomato/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-tomato/source/blender/render/intern/include/rendercore.h
branches/soc-2011-tomato/source/blender/render/intern/source/pixelblending.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.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-47067
+ /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-47070
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_Debug.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_Debug.h 2012-05-27 12:21:13 UTC (rev 47070)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_Debug.h 2012-05-27 12:23:20 UTC (rev 47071)
@@ -51,8 +51,8 @@
#ifdef GHOST_DEBUG
-# define GHOST_PRINT(x) { std::cout << x; }
-# define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); }
+# define GHOST_PRINT(x) { std::cout << x; } (void)0
+# define GHOST_PRINTF(x, ...) { printf(x, __VA_ARGS__); } (void)0
#else // GHOST_DEBUG
# define GHOST_PRINT(x)
# define GHOST_PRINTF(x, ...)
@@ -67,7 +67,7 @@
GHOST_PRINT(info); \
GHOST_PRINT("\n"); \
} \
- }
+ } (void)0
#else // GHOST_DEBUG
# define GHOST_ASSERT(x, info)
#endif // GHOST_DEBUG
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp 2012-05-27 12:21:13 UTC (rev 47070)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp 2012-05-27 12:23:20 UTC (rev 47071)
@@ -142,7 +142,7 @@
const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{
GHOST_TSuccess success = GHOST_kFailure;
- GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
+ GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager");
if (m_displayManager) {
if (!m_windowManager->getFullScreen()) {
m_displayManager->getCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, m_preFullScreenSetting);
@@ -184,12 +184,12 @@
GHOST_TSuccess GHOST_System::endFullScreen(void)
{
GHOST_TSuccess success = GHOST_kFailure;
- GHOST_ASSERT(m_windowManager, "GHOST_System::endFullScreen(): invalid window manager")
+ GHOST_ASSERT(m_windowManager, "GHOST_System::endFullScreen(): invalid window manager");
if (m_windowManager->getFullScreen()) {
//GHOST_IWindow* window = m_windowManager->getFullScreenWindow();
//GHOST_PRINT("GHOST_System::endFullScreen(): leaving window manager full-screen mode\n");
success = m_windowManager->endFullScreen();
- GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager")
+ GHOST_ASSERT(m_displayManager, "GHOST_System::endFullScreen(): invalid display manager");
//GHOST_PRINT("GHOST_System::endFullScreen(): leaving full-screen mode\n");
success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, m_preFullScreenSetting);
}
@@ -350,7 +350,7 @@
GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window **window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
{
GHOST_TSuccess success;
- GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
+ GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager");
GHOST_DisplaySetting settings;
success = m_displayManager->getCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, settings);
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp 2012-05-27 12:21:13 UTC (rev 47070)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp 2012-05-27 12:23:20 UTC (rev 47071)
@@ -57,8 +57,6 @@
#include "GHOST_NDOFManager.h"
#include "AssertMacros.h"
-#define GHOST_KEY_SWITCH(mac, ghost) { case (mac): ghostKey = (ghost); break; }
-
/* blender class and types events */
enum {
kEventClassBlender = 'blnd'
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-05-27 12:21:13 UTC (rev 47070)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-05-27 12:23:20 UTC (rev 47071)
@@ -389,11 +389,11 @@
// Determine whether this system has a high frequency performance counter. */
m_hasPerformanceCounter = ::QueryPerformanceFrequency((LARGE_INTEGER *)&m_freq) == TRUE;
if (m_hasPerformanceCounter) {
- GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer available\n")
+ GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer available\n");
::QueryPerformanceCounter((LARGE_INTEGER *)&m_start);
}
else {
- GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer not available\n")
+ GHOST_PRINT("GHOST_SystemWin32::init: High Frequency Performance Timer not available\n");
}
if (success) {
@@ -885,7 +885,7 @@
LRESULT lResult = 0;
GHOST_SystemWin32 *system = ((GHOST_SystemWin32 *)getSystem());
- GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized")
+ GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized");
if (hwnd) {
GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLong(hwnd, GWL_USERDATA);
@@ -917,9 +917,9 @@
case RIM_TYPEKEYBOARD:
event = processKeyEvent(window, raw);
if (!event) {
- GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ")
- GHOST_PRINT(msg)
- GHOST_PRINT(" key ignored\n")
+ GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ");
+ GHOST_PRINT(msg);
+ GHOST_PRINT(" key ignored\n");
}
break;
#ifdef WITH_INPUT_NDOF
@@ -1233,7 +1233,7 @@
}
else {
// Event found for a window before the pointer to the class has been set.
- GHOST_PRINT("GHOST_SystemWin32::wndProc: GHOST window event before creation\n")
+ GHOST_PRINT("GHOST_SystemWin32::wndProc: GHOST window event before creation\n");
/* These are events we typically miss at this point:
WM_GETMINMAXINFO 0x24
WM_NCCREATE 0x81
@@ -1245,7 +1245,7 @@
}
else {
// Events without valid hwnd
- GHOST_PRINT("GHOST_SystemWin32::wndProc: event without window\n")
+ GHOST_PRINT("GHOST_SystemWin32::wndProc: event without window\n");
}
if (event) {
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp 2012-05-27 12:21:13 UTC (rev 47070)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp 2012-05-27 12:23:20 UTC (rev 47071)
@@ -221,7 +221,7 @@
void GHOST_WindowCarbon::setTitle(const STR_String& title)
{
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setTitle(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setTitle(): window invalid");
Str255 title255;
gen2mac(title, title255);
::SetWTitle(m_windowRef, title255);
@@ -230,7 +230,7 @@
void GHOST_WindowCarbon::getTitle(STR_String& title) const
{
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getTitle(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getTitle(): window invalid");
Str255 title255;
::GetWTitle(m_windowRef, title255);
mac2gen(title255, title);
@@ -241,7 +241,7 @@
{
OSStatus success;
Rect rect;
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getWindowBounds(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getWindowBounds(): window invalid");
success = ::GetWindowBounds(m_windowRef, kWindowStructureRgn, &rect);
bounds.m_b = rect.bottom;
bounds.m_l = rect.left;
@@ -253,7 +253,7 @@
void GHOST_WindowCarbon::getClientBounds(GHOST_Rect& bounds) const
{
Rect rect;
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getClientBounds(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getClientBounds(): window invalid");
//::GetPortBounds(m_grafPtr, &rect);
::GetWindowBounds(m_windowRef, kWindowContentRgn, &rect);
@@ -277,7 +277,7 @@
GHOST_TSuccess GHOST_WindowCarbon::setClientWidth(GHOST_TUns32 width)
{
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientWidth(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientWidth(): window invalid");
GHOST_Rect cBnds, wBnds;
getClientBounds(cBnds);
if (((GHOST_TUns32)cBnds.getWidth()) != width) {
@@ -289,7 +289,7 @@
GHOST_TSuccess GHOST_WindowCarbon::setClientHeight(GHOST_TUns32 height)
{
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientHeight(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientHeight(): window invalid");
GHOST_Rect cBnds, wBnds;
getClientBounds(cBnds);
#ifdef GHOST_DRAW_CARBON_GUTTER
@@ -307,7 +307,7 @@
GHOST_TSuccess GHOST_WindowCarbon::setClientSize(GHOST_TUns32 width, GHOST_TUns32 height)
{
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientSize(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::setClientSize(): window invalid");
GHOST_Rect cBnds, wBnds;
getClientBounds(cBnds);
#ifdef GHOST_DRAW_CARBON_GUTTER
@@ -328,7 +328,7 @@
GHOST_TWindowState GHOST_WindowCarbon::getState() const
{
- GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getState(): window invalid")
+ GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getState(): window invalid");
GHOST_TWindowState state;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list