[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40844] branches/soc-2011-cucumber: svn merge -r40820:40843(HEAD) https://svn.blender.org/svnroot/bf-blender/ trunk/blender

Dalai Felinto dfelinto at gmail.com
Fri Oct 7 08:57:18 CEST 2011


Revision: 40844
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40844
Author:   dfelinto
Date:     2011-10-07 06:57:18 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
svn merge -r40820:40843(HEAD) https://svn.blender.org/svnroot/bf-blender/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40820

Modified Paths:
--------------
    branches/soc-2011-cucumber/intern/container/CTR_List.h
    branches/soc-2011-cucumber/intern/container/CTR_Map.h
    branches/soc-2011-cucumber/intern/ghost/GHOST_Types.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Buttons.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_ModifierKeys.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsCarbon.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemPathsCocoa.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_TaskbarWin32.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Window.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCarbon.h
    branches/soc-2011-cucumber/intern/ghost/test/gears/GHOST_C-Test.c
    branches/soc-2011-cucumber/intern/mikktspace/mikktspace.c
    branches/soc-2011-cucumber/intern/string/STR_String.h
    branches/soc-2011-cucumber/po/fr.po
    branches/soc-2011-cucumber/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/material.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
    branches/soc-2011-cucumber/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2011-cucumber/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-cucumber/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2011-cucumber/source/gameengine/VideoTexture/ImageRender.h
    branches/soc-2011-cucumber/source/gameengine/VideoTexture/ImageViewport.h

Property Changed:
----------------
    branches/soc-2011-cucumber/
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36829-40545,40632-40820
   + /trunk/blender:36829-40545,40632-40843

Modified: branches/soc-2011-cucumber/intern/container/CTR_List.h
===================================================================
--- branches/soc-2011-cucumber/intern/container/CTR_List.h	2011-10-07 06:21:55 UTC (rev 40843)
+++ branches/soc-2011-cucumber/intern/container/CTR_List.h	2011-10-07 06:57:18 UTC (rev 40844)
@@ -37,18 +37,18 @@
 
 class CTR_Link {
 public:
-    CTR_Link(
+	CTR_Link(
 	) ;
 
-    CTR_Link(
+	CTR_Link(
 		CTR_Link *next,
 		CTR_Link *prev
 	) ;
-    
+
 		CTR_Link *
 	getNext(
 	) const ;
-  
+
 		CTR_Link *
 	getPrev(
 	) const ;
@@ -76,14 +76,14 @@
 	) ;
 
 private:  
-    CTR_Link  *m_next;
-    CTR_Link  *m_prev;
+	CTR_Link  *m_next;
+	CTR_Link  *m_prev;
 };
 
 class CTR_List {
 public:
 
-    CTR_List(
+	CTR_List(
 	) ;
 
 		CTR_Link *
@@ -103,10 +103,10 @@
 	addTail(
 		CTR_Link *link
 	) ;
-    
+
 private:
-    CTR_Link m_head;
-    CTR_Link m_tail;
+	CTR_Link m_head;
+	CTR_Link m_tail;
 };
 
 #endif

Modified: branches/soc-2011-cucumber/intern/container/CTR_Map.h
===================================================================
--- branches/soc-2011-cucumber/intern/container/CTR_Map.h	2011-10-07 06:21:55 UTC (rev 40843)
+++ branches/soc-2011-cucumber/intern/container/CTR_Map.h	2011-10-07 06:57:18 UTC (rev 40844)
@@ -37,24 +37,24 @@
 template <class Key, class Value>
 class CTR_Map {
 private:
-    struct Entry {
-        Entry (Entry *next, Key key, Value value) :
-            m_next(next),
-            m_key(key),
-            m_value(value) {}
+	struct Entry {
+		Entry (Entry *next, Key key, Value value) :
+		    m_next(next),
+		    m_key(key),
+		    m_value(value) {}
 
-        Entry *m_next;
-        Key    m_key;
-        Value  m_value;
-    };
- 
+		Entry *m_next;
+		Key    m_key;
+		Value  m_value;
+	};
+
 public:
-    CTR_Map(int num_buckets = 100) : m_num_buckets(num_buckets) {
-        m_buckets = new Entry *[num_buckets];
-        for (int i = 0; i < num_buckets; ++i) {
-            m_buckets[i] = 0;
-        }
-    }
+	CTR_Map(int num_buckets = 100) : m_num_buckets(num_buckets) {
+		m_buckets = new Entry *[num_buckets];
+		for (int i = 0; i < num_buckets; ++i) {
+			m_buckets[i] = 0;
+		}
+	}
 
 	CTR_Map(const CTR_Map& map)
 	{
@@ -68,114 +68,114 @@
 				insert(entry->m_key, entry->m_value);
 		}
 	}
-    
-    int size() { 
-        int count=0;
-        for (int i=0;i<m_num_buckets;i++)
-        {
-            Entry* bucket = m_buckets[i];
-            while(bucket)
-            {
-                bucket = bucket->m_next;
-                count++;
-            }
-        }
-        return count;
-    }
-    
-    Value* at(int index) {
-        int count=0;
-        for (int i=0;i<m_num_buckets;i++)
-        {
-            Entry* bucket = m_buckets[i];
-            while(bucket)
-            {
-                if (count==index)
-                {
-                    return &bucket->m_value;
-                }
-                bucket = bucket->m_next;
-                count++;
-            }
-        }
-        return 0;
-    }
 
-    Key* getKey(int index) {
-        int count=0;
-        for (int i=0;i<m_num_buckets;i++)
-        {
-            Entry* bucket = m_buckets[i];
-            while(bucket)
-            {
-                if (count==index)
-                {
-                    return &bucket->m_key;
-                }
-                bucket = bucket->m_next;
-                count++;
-            }
-        }
-        return 0;
-    }
-    
-    void clear() {
-        for (int i = 0; i < m_num_buckets; ++i) {
-            Entry *entry_ptr = m_buckets[i];
-            
-            while (entry_ptr != 0) {
-                Entry *tmp_ptr = entry_ptr->m_next;
-                delete entry_ptr;
-                entry_ptr = tmp_ptr;
-            }
-            m_buckets[i] = 0;
-        }
-    }
-    
-    ~CTR_Map() {
-        clear();
-        delete [] m_buckets;
-    }
-    
-    void insert(const Key& key, const Value& value) {
-        Entry *entry_ptr = m_buckets[key.hash() % m_num_buckets];
-        while ((entry_ptr != 0) && !(key == entry_ptr->m_key)) {
-            entry_ptr = entry_ptr->m_next;
-        }
-        
-        if (entry_ptr != 0) {
-            entry_ptr->m_value = value;
-        }
-        else {
-            Entry **bucket = &m_buckets[key.hash() % m_num_buckets];
-            *bucket = new Entry(*bucket, key, value);
-        }
-    }
+	int size() {
+		int count=0;
+		for (int i=0;i<m_num_buckets;i++)
+		{
+			Entry* bucket = m_buckets[i];
+			while(bucket)
+			{
+				bucket = bucket->m_next;
+				count++;
+			}
+		}
+		return count;
+	}
 
-    void remove(const Key& key) {
-        Entry **entry_ptr = &m_buckets[key.hash() % m_num_buckets];
-        while ((*entry_ptr != 0) && !(key == (*entry_ptr)->m_key)) {
-            entry_ptr = &(*entry_ptr)->m_next;
-        }
-        
-        if (*entry_ptr != 0) {
-            Entry *tmp_ptr = (*entry_ptr)->m_next;
-            delete *entry_ptr;
-            *entry_ptr = tmp_ptr;
-        }
-    }
+	Value* at(int index) {
+		int count=0;
+		for (int i=0;i<m_num_buckets;i++)
+		{
+			Entry* bucket = m_buckets[i];
+			while(bucket)
+			{
+				if (count==index)
+				{
+					return &bucket->m_value;
+				}
+				bucket = bucket->m_next;
+				count++;
+			}
+		}
+		return 0;
+	}
 
-    Value *operator[](Key key) {
-        Entry *bucket = m_buckets[key.hash() % m_num_buckets];
-        while ((bucket != 0) && !(key == bucket->m_key)) {
-            bucket = bucket->m_next;
-        }
-        return bucket != 0 ? &bucket->m_value : 0;
-    }
-    
+	Key* getKey(int index) {
+		int count=0;
+		for (int i=0;i<m_num_buckets;i++)
+		{
+			Entry* bucket = m_buckets[i];
+			while(bucket)
+			{
+				if (count==index)
+				{
+					return &bucket->m_key;
+				}
+				bucket = bucket->m_next;
+				count++;
+			}
+		}
+		return 0;
+	}
+
+	void clear() {
+		for (int i = 0; i < m_num_buckets; ++i) {
+			Entry *entry_ptr = m_buckets[i];
+
+			while (entry_ptr != 0) {
+				Entry *tmp_ptr = entry_ptr->m_next;
+				delete entry_ptr;
+				entry_ptr = tmp_ptr;
+			}
+			m_buckets[i] = 0;
+		}
+	}
+
+	~CTR_Map() {
+		clear();
+		delete [] m_buckets;
+	}
+
+	void insert(const Key& key, const Value& value) {
+		Entry *entry_ptr = m_buckets[key.hash() % m_num_buckets];
+		while ((entry_ptr != 0) && !(key == entry_ptr->m_key)) {
+			entry_ptr = entry_ptr->m_next;
+		}
+
+		if (entry_ptr != 0) {
+			entry_ptr->m_value = value;
+		}
+		else {
+			Entry **bucket = &m_buckets[key.hash() % m_num_buckets];
+			*bucket = new Entry(*bucket, key, value);
+		}
+	}
+
+	void remove(const Key& key) {
+		Entry **entry_ptr = &m_buckets[key.hash() % m_num_buckets];
+		while ((*entry_ptr != 0) && !(key == (*entry_ptr)->m_key)) {
+			entry_ptr = &(*entry_ptr)->m_next;
+		}
+
+		if (*entry_ptr != 0) {
+			Entry *tmp_ptr = (*entry_ptr)->m_next;
+			delete *entry_ptr;
+			*entry_ptr = tmp_ptr;
+		}
+	}
+
+	Value *operator[](Key key) {
+		Entry *bucket = m_buckets[key.hash() % m_num_buckets];
+		while ((bucket != 0) && !(key == bucket->m_key)) {
+			bucket = bucket->m_next;
+		}
+		return bucket != 0 ? &bucket->m_value : 0;
+	}
+
 private:
-    int     m_num_buckets;
-    Entry **m_buckets;
+	int     m_num_buckets;
+	Entry **m_buckets;
 };
 
 #endif

Modified: branches/soc-2011-cucumber/intern/ghost/GHOST_Types.h
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/GHOST_Types.h	2011-10-07 06:21:55 UTC (rev 40843)
+++ branches/soc-2011-cucumber/intern/ghost/GHOST_Types.h	2011-10-07 06:57:18 UTC (rev 40844)
@@ -96,14 +96,14 @@
 } GHOST_TFireTimeConstant;
 
 typedef enum {
-    GHOST_kModifierKeyLeftShift = 0,
-    GHOST_kModifierKeyRightShift,
-    GHOST_kModifierKeyLeftAlt,
-    GHOST_kModifierKeyRightAlt,
-    GHOST_kModifierKeyLeftControl,
-    GHOST_kModifierKeyRightControl,
-    GHOST_kModifierKeyOS,
-    GHOST_kModifierKeyNumMasks
+	GHOST_kModifierKeyLeftShift = 0,
+	GHOST_kModifierKeyRightShift,
+	GHOST_kModifierKeyLeftAlt,
+	GHOST_kModifierKeyRightAlt,
+	GHOST_kModifierKeyLeftControl,
+	GHOST_kModifierKeyRightControl,
+	GHOST_kModifierKeyOS,
+	GHOST_kModifierKeyNumMasks
 } GHOST_TModifierKeyMask;
 
 

Modified: branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Buttons.h
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Buttons.h	2011-10-07 06:21:55 UTC (rev 40843)
+++ branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Buttons.h	2011-10-07 06:57:18 UTC (rev 40844)
@@ -44,35 +44,35 @@
  * @date	May 15, 2001
  */
 struct GHOST_Buttons {
-    /**
-     * Constructor.
-     */
-    GHOST_Buttons();
+	/**
+	 * Constructor.
+	 */
+	GHOST_Buttons();
 
 	virtual ~GHOST_Buttons();
-    
-    /**
-     * Returns the state of a single button.
-     * @param mask. Key button to return.
-     * @return The state of the button (pressed == true).
-     */
-    virtual bool get(GHOST_TButtonMask mask) const;
-    
-    /**
-     * Updates the state of a single button.
-     * @param mask. Button state to update.
-     * @param down. The new state of the button.
-     */
-    virtual void set(GHOST_TButtonMask mask, bool down);
-    
-    /**
-     * Sets the state of all buttons to up.
-     */
-    virtual void clear(); 
-    
-    GHOST_TUns8 m_ButtonLeft		: 1;
-    GHOST_TUns8 m_ButtonMiddle		: 1;
-    GHOST_TUns8 m_ButtonRight		: 1;
+
+	/**
+	 * Returns the state of a single button.
+	 * @param mask. Key button to return.
+	 * @return The state of the button (pressed == true).
+	 */
+	virtual bool get(GHOST_TButtonMask mask) const;
+
+	/**
+	 * Updates the state of a single button.
+	 * @param mask. Button state to update.
+	 * @param down. The new state of the button.
+	 */
+	virtual void set(GHOST_TButtonMask mask, bool down);
+
+	/**
+	 * Sets the state of all buttons to up.
+	 */
+	virtual void clear();
+
+	GHOST_TUns8 m_ButtonLeft		: 1;
+	GHOST_TUns8 m_ButtonMiddle		: 1;
+	GHOST_TUns8 m_ButtonRight		: 1;
 };
 
 #endif // _GHOST_BUTTONS_H_

Modified: branches/soc-2011-cucumber/intern/ghost/intern/GHOST_ModifierKeys.h
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/intern/GHOST_ModifierKeys.h	2011-10-07 06:21:55 UTC (rev 40843)
+++ branches/soc-2011-cucumber/intern/ghost/intern/GHOST_ModifierKeys.h	2011-10-07 06:57:18 UTC (rev 40844)
@@ -44,10 +44,10 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list