[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50522] branches/soc-2011-tomato: Merging r50502 through r50521 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Sep 11 11:13:57 CEST 2012
Revision: 50522
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50522
Author: nazgul
Date: 2012-09-11 09:13:57 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
Merging r50502 through r50521 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50502
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50521
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/render/session.cpp
branches/soc-2011-tomato/intern/string/STR_String.h
branches/soc-2011-tomato/intern/string/intern/STR_String.cpp
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MeshObject.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-50501
+ /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-50521
Modified: branches/soc-2011-tomato/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/session.cpp 2012-09-11 09:07:46 UTC (rev 50521)
+++ branches/soc-2011-tomato/intern/cycles/render/session.cpp 2012-09-11 09:13:57 UTC (rev 50522)
@@ -320,7 +320,7 @@
/* get next tile from manager */
Tile tile;
- int device_num = device->device_number(tile_device);
+ int device_num = (params.background)? 0: device->device_number(tile_device);
if(!tile_manager.next_tile(tile, device_num))
return false;
Modified: branches/soc-2011-tomato/intern/string/STR_String.h
===================================================================
--- branches/soc-2011-tomato/intern/string/STR_String.h 2012-09-11 09:07:46 UTC (rev 50521)
+++ branches/soc-2011-tomato/intern/string/STR_String.h 2012-09-11 09:13:57 UTC (rev 50522)
@@ -66,8 +66,8 @@
typedef unsigned char byte;
/**
- * Smart String Value class. Is used by parser when an expression tree is build containing string.
-*/
+ * Smart String Value class. Is used by parser when an expression tree is build containing string.
+ */
class STR_String
{
@@ -85,16 +85,16 @@
explicit STR_String(dword val);
explicit STR_String(float val);
explicit STR_String(double val);
- inline ~STR_String() { delete[] pData; }
+ inline ~STR_String() { delete[] this->m_data; }
// Operations
STR_String& Format(const char *fmt, ...); // Set formatted text to string
STR_String& FormatAdd(const char *fmt, ...); // Add formatted text to string
- inline void Clear() { Len = pData[0] = 0; }
+ inline void Clear() { this->m_len = this->m_data[0] = 0; }
inline const STR_String & Reverse()
{
- for (int i1 = 0, i2 = Len - 1; i1 < i2; i1++, i2--) {
- std::swap(pData[i1], pData[i2]);
+ for (int i1 = 0, i2 = this->m_len - 1; i1 < i2; i1++, i2--) {
+ std::swap(this->m_data[i1], this->m_data[i2]);
}
return *this;
}
@@ -102,28 +102,28 @@
// Properties
bool IsUpper() const;
bool IsLower() const;
- inline bool IsEmpty() const { return Len == 0; }
- inline int Length() const { return Len; }
+ inline bool IsEmpty() const { return this->m_len == 0; }
+ inline int Length() const { return this->m_len; }
// Data access
- inline STR_String& SetLength(int len) { AllocBuffer(len, true); Len=len; pData[len]=0; return *this; }
- inline char GetAt(int pos) const { assertd(pos<Len); return pData[pos]; }
- inline void SetAt(int pos, char c) { assertd(pos<Len); pData[pos]=c; }
+ inline STR_String& SetLength(int len) { AllocBuffer(len, true); this->m_len = len; this->m_data[len] = 0; return *this; }
+ inline char GetAt(int pos) const { assertd(pos<this->m_len); return this->m_data[pos]; }
+ inline void SetAt(int pos, char c) { assertd(pos<this->m_len); this->m_data[pos] = c; }
inline void SetAt(int pos, rcSTR_String str);
inline void SetAt(int pos, int num, rcSTR_String str);
void Replace(int pos, rcSTR_String str);
void Replace(int pos, int num, rcSTR_String str);
// Substrings
- inline STR_String Left(int num) const { num = (num < Len ? num:Len ); return STR_String(pData, num); }
- inline STR_String Right(int num) const { num = (num < Len ? num:Len ); return STR_String(pData+Len-num, num); }
- inline STR_String Mid(int pos, int num = INT_MAX) const { pos = (pos < Len ? pos:Len ); num = (num < (Len - pos) ? num : (Len - pos)); return STR_String(pData+pos, num); }
+ inline STR_String Left(int num) const { num = (num < this->m_len ? num:this->m_len ); return STR_String(this->m_data, num); }
+ inline STR_String Right(int num) const { num = (num < this->m_len ? num:this->m_len ); return STR_String(this->m_data + this->m_len - num, num); }
+ inline STR_String Mid(int pos, int num = INT_MAX) const { pos = (pos < this->m_len ? pos:this->m_len ); num = (num < (this->m_len - pos) ? num : (this->m_len - pos)); return STR_String(this->m_data + pos, num); }
// Comparison
int Compare(rcSTR_String rhs) const;
int CompareNoCase(rcSTR_String rhs) const;
- inline bool IsEqual(rcSTR_String rhs) const { return (Compare(rhs) == 0); }
- inline bool IsEqualNoCase(rcSTR_String rhs) const { return (CompareNoCase(rhs) == 0); }
+ inline bool IsEqual(rcSTR_String rhs) const { return (Compare(rhs) == 0); }
+ inline bool IsEqualNoCase(rcSTR_String rhs) const { return (CompareNoCase(rhs) == 0); }
// Search/replace
int Find(char c, int pos = 0) const;
@@ -148,12 +148,12 @@
STR_String& TrimQuotes();
// Conversions
-// inline operator char*() { return pData; }
- inline operator const char *() const { return pData; }
- inline char *Ptr() { return pData; }
- inline const char *ReadPtr() const { return pData; }
- inline float ToFloat() const { float x=(float)(atof(pData)); return x; }
- inline int ToInt() const { return atoi(pData); }
+// inline operator char*() { return this->m_data; }
+ inline operator const char *() const { return this->m_data; }
+ inline char *Ptr() { return this->m_data; }
+ inline const char *ReadPtr() const { return this->m_data; }
+ inline float ToFloat() const { float x=(float)(atof(this->m_data)); return x; }
+ inline int ToInt() const { return atoi(this->m_data); }
// Operators
inline rcSTR_String operator=(const byte *rhs) { return Copy((const char *)rhs, strlen((const char *)rhs)); }
@@ -198,9 +198,9 @@
static bool isUpper(char c) { return (c>='A') && (c <= 'Z'); }
static bool isSpace(char c) { return (c==' ') || (c=='\t'); }
- char *pData; // -> STR_String data
- int Len; // Data length
- int Max; // Space in data buffer
+ char *m_data; // -> STR_String data
+ int m_len; //z Data length
+ int m_max; // Space in data buffer
#ifdef WITH_CXX_GUARDEDALLOC
Modified: branches/soc-2011-tomato/intern/string/intern/STR_String.cpp
===================================================================
--- branches/soc-2011-tomato/intern/string/intern/STR_String.cpp 2012-09-11 09:07:46 UTC (rev 50521)
+++ branches/soc-2011-tomato/intern/string/intern/STR_String.cpp 2012-09-11 09:13:57 UTC (rev 50522)
@@ -27,14 +27,9 @@
/** \file string/intern/STR_String.cpp
* \ingroup string
- */
-
-
-/**
-
+ *
* Copyright (C) 2001 NaN Technologies B.V.
* This file was formerly known as: GEN_StdString.cpp.
- * @date April, 25, 2001
*/
#include <stdio.h>
@@ -51,17 +46,18 @@
Construction / destruction
-------------------------------------------------------------------------------------------------*/
+#define STR_STRING_SIZE_DEFAULT_WORD 32 /* default size for a new word */
+#define STR_STRING_SIZE_DEFAULT_CHAR 9 /* default size for a new char */
-
//
// Construct an empty string
//
STR_String::STR_String() :
- pData(new char[32]),
- Len(0),
- Max(32)
+ m_data(new char[STR_STRING_SIZE_DEFAULT_WORD]),
+ m_len(0),
+ m_max(STR_STRING_SIZE_DEFAULT_WORD)
{
- pData[0] = 0;
+ this->m_data[0] = 0;
}
@@ -70,12 +66,12 @@
// Construct a string of one character
//
STR_String::STR_String(char c) :
- pData(new char[9]),
- Len(1),
- Max(9)
+ m_data(new char[STR_STRING_SIZE_DEFAULT_CHAR]),
+ m_len(1),
+ m_max(STR_STRING_SIZE_DEFAULT_CHAR)
{
- pData[0] = c;
- pData[1] = 0;
+ this->m_data[0] = c;
+ this->m_data[1] = 0;
}
@@ -84,13 +80,13 @@
// Construct a string of multiple repeating characters
//
STR_String::STR_String(char c, int len) :
- pData(new char[len + 8]),
- Len(len),
- Max(len + 8)
+ m_data(new char[len + 8]),
+ m_len(len),
+ m_max(len + 8)
{
- assertd(pData != NULL);
- memset(pData, c, len);
- pData[len] = 0;
+ assertd(this->m_data != NULL);
+ memset(this->m_data, c, len);
+ this->m_data[len] = 0;
}
@@ -102,17 +98,17 @@
STR_String::STR_String(const char *str)
{
if (str) {
- Len = ::strlen(str);
- Max = Len + 8;
- pData = new char[Max];
- assertd(pData != NULL);
- ::memcpy(pData, str, Len);
- pData[Len] = 0;
+ this->m_len = ::strlen(str);
+ this->m_max = this->m_len + 8;
+ this->m_data = new char[this->m_max];
+ assertd(this->m_data != NULL);
+ ::memcpy(this->m_data, str, this->m_len);
+ this->m_data[this->m_len] = 0;
}
else {
- pData = 0;
- Len = 0;
- Max = 8;
+ this->m_data = 0;
+ this->m_len = 0;
+ this->m_max = 8;
}
}
@@ -122,13 +118,13 @@
// Construct a string from a pointer-to-ASCII-string and a length
//
STR_String::STR_String(const char *str, int len) :
- pData(new char[len + 8]),
- Len(len),
- Max(len + 8)
+ m_data(new char[len + 8]),
+ m_len(len),
+ m_max(len + 8)
{
- assertd(pData != NULL);
- memcpy(pData, str, len);
- pData[len] = 0;
+ assertd(this->m_data != NULL);
+ memcpy(this->m_data, str, len);
+ this->m_data[len] = 0;
}
@@ -137,14 +133,14 @@
// Construct a string from another string
//
STR_String::STR_String(rcSTR_String str) :
- pData(new char[str.Length() + 8]),
- Len(str.Length()),
- Max(str.Length() + 8)
+ m_data(new char[str.Length() + 8]),
+ m_len(str.Length()),
+ m_max(str.Length() + 8)
{
- assertd(pData != NULL);
- assertd(str.pData != NULL);
- memcpy(pData, str.pData, str.Length());
- pData[str.Length()] = 0;
+ assertd(this->m_data != NULL);
+ assertd(str.this->m_data != NULL);
+ memcpy(this->m_data, str.ReadPtr(), str.Length());
+ this->m_data[str.Length()] = 0;
}
@@ -153,14 +149,14 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list