[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58946] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Tue Aug 6 02:08:34 CEST 2013
Revision: 58946
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58946
Author: gdh
Date: 2013-08-06 00:08:33 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58941 to r58945.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58941
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58945
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h
branches/soc-2013-cycles_mblur/source/blender/compositor/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/compositor/COM_compositor.h
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_interface.h
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_SplitOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_SplitOperation.h
Removed Paths:
-------------
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_ViewerBaseOperation.h
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58940
+ /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58945
Modified: branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/intern/guardedalloc/MEM_guardedalloc.h 2013-08-06 00:08:33 UTC (rev 58946)
@@ -98,6 +98,7 @@
* newly allocated block. */
void *MEM_dupallocN(const void *vmemh)
#if MEM_GNU_ATTRIBUTES
+ __attribute__((malloc))
__attribute__((warn_unused_result))
#endif
;
@@ -109,6 +110,7 @@
* over from existing memory. */
void *MEM_reallocN_id(void *vmemh, size_t len, const char *str)
#if MEM_GNU_ATTRIBUTES
+ __attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((alloc_size(2)))
#endif
@@ -119,6 +121,7 @@
*/
void *MEM_recallocN_id(void *vmemh, size_t len, const char *str)
#if MEM_GNU_ATTRIBUTES
+ __attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((alloc_size(2)))
#endif
@@ -133,6 +136,7 @@
* pointer to it is stored ! */
void *MEM_callocN(size_t len, const char *str)
#if MEM_GNU_ATTRIBUTES
+ __attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(2)))
__attribute__((alloc_size(1)))
@@ -145,6 +149,7 @@
* */
void *MEM_mallocN(size_t len, const char *str)
#if MEM_GNU_ATTRIBUTES
+ __attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(2)))
__attribute__((alloc_size(1)))
@@ -157,6 +162,7 @@
* */
void *MEM_mapallocN(size_t len, const char *str)
#if MEM_GNU_ATTRIBUTES
+ __attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(2)))
__attribute__((alloc_size(1)))
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_memarena.h 2013-08-06 00:08:33 UTC (rev 58946)
@@ -55,6 +55,7 @@
struct MemArena *BLI_memarena_new(const int bufsize, const char *name)
#if MEM_GNU_ATTRIBUTES
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(2)))
#endif
@@ -85,6 +86,7 @@
void *BLI_memarena_alloc(struct MemArena *ma, int size)
#if MEM_GNU_ATTRIBUTES
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(1)))
__attribute__((alloc_size(2)))
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h 2013-08-06 00:08:33 UTC (rev 58946)
@@ -50,17 +50,20 @@
BLI_mempool *BLI_mempool_create(int esize, int totelem, int pchunk, int flag)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
#endif
;
void *BLI_mempool_alloc(BLI_mempool *pool)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(1)))
#endif
;
void *BLI_mempool_calloc(BLI_mempool *pool)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(1)))
#endif
@@ -94,6 +97,7 @@
void **BLI_mempool_as_tableN(BLI_mempool *pool, const char *allocstr)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(1, 2)))
#endif
@@ -107,6 +111,7 @@
void *BLI_mempool_as_arrayN(BLI_mempool *pool, const char *allocstr)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull(1, 2)))
#endif
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_string.h 2013-08-06 00:08:33 UTC (rev 58946)
@@ -40,6 +40,7 @@
char *BLI_strdupn(const char *str, const size_t len)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
@@ -47,6 +48,7 @@
char *BLI_strdup(const char *str)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
@@ -54,6 +56,7 @@
char *BLI_strdupcat(const char *__restrict str1, const char *__restrict str2)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
@@ -81,6 +84,7 @@
char *BLI_str_quoted_substrN(const char *__restrict str, const char *__restrict prefix)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
@@ -88,6 +92,7 @@
char *BLI_replacestrN(const char *__restrict str, const char *__restrict substr_old, const char *__restrict substr_new)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
@@ -108,6 +113,7 @@
char *BLI_sprintfN(const char *__restrict format, ...)
#ifdef __GNUC__
+__attribute__((malloc))
__attribute__ ((format(printf, 1, 2)))
__attribute__((warn_unused_result))
__attribute__((nonnull))
@@ -183,4 +189,4 @@
}
#endif
-#endif
+#endif /* __BLI_STRING_H__ */
Modified: branches/soc-2013-cycles_mblur/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/compositor/CMakeLists.txt 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/source/blender/compositor/CMakeLists.txt 2013-08-06 00:08:33 UTC (rev 58946)
@@ -425,14 +425,12 @@
operations/COM_CompositorOperation.cpp
operations/COM_OutputFileOperation.h
operations/COM_OutputFileOperation.cpp
- operations/COM_ViewerBaseOperation.h
- operations/COM_ViewerBaseOperation.cpp
operations/COM_ViewerOperation.h
operations/COM_ViewerOperation.cpp
operations/COM_PreviewOperation.h
operations/COM_PreviewOperation.cpp
- operations/COM_SplitViewerOperation.h
- operations/COM_SplitViewerOperation.cpp
+ operations/COM_SplitOperation.h
+ operations/COM_SplitOperation.cpp
operations/COM_ConvertValueToColorProg.h
operations/COM_ConvertValueToColorProg.cpp
operations/COM_ConvertColorToValueProg.h
Modified: branches/soc-2013-cycles_mblur/source/blender/compositor/COM_compositor.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/compositor/COM_compositor.h 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/source/blender/compositor/COM_compositor.h 2013-08-06 00:08:33 UTC (rev 58946)
@@ -107,7 +107,7 @@
* - [@ref ChunkExecutionState.COM_ES_EXECUTED]: Chunk is finished
*
* @see ExecutionGroup.execute
- * @see ViewerBaseOperation.getChunkOrder
+ * @see ViewerOperation.getChunkOrder
* @see OrderOfChunks
*
* @section interest Area of interest
Modified: branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionGroup.cpp 2013-08-05 23:22:56 UTC (rev 58945)
+++ branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionGroup.cpp 2013-08-06 00:08:33 UTC (rev 58946)
@@ -248,7 +248,7 @@
OrderOfChunks chunkorder = COM_ORDER_OF_CHUNKS_DEFAULT;
if (operation->isViewerOperation()) {
- ViewerBaseOperation *viewer = (ViewerBaseOperation *)operation;
+ ViewerOperation *viewer = (ViewerOperation *)operation;
centerX = viewer->getCenterX();
centerY = viewer->getCenterY();
chunkorder = viewer->getChunkOrder();
Modified: branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp 2013-08-05 23:22:56 UTC (rev 58945)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list