Revision: 48376
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48376
Author: campbellbarton
Date: 2012-06-28 14:19:53 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48370:48375
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48370
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-tomato/source/blender/render/intern/raytrace/bvh.h
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-48370
+
/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-48375
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-06-28
14:18:04 UTC (rev 48375)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-06-28
14:19:53 UTC (rev 48376)
@@ -239,8 +239,7 @@
${OPENGL_glu_LIBRARY}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
- ${FREETYPE_LIBRARY}
- ${LAPACK_LIBRARIES})
+ ${FREETYPE_LIBRARY})
# since we are using the local libs for python when compiling msvc
projects, we need to add _d when compiling debug versions
if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
@@ -352,7 +351,9 @@
if(WITH_INPUT_NDOF)
target_link_libraries(${target} ${NDOF_LIBRARIES})
endif()
-
+ if(WITH_MOD_CLOTH_ELTOPO)
+ target_link_libraries(${target} ${LAPACK_LIBRARIES})
+ endif()
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
@@ -458,6 +459,12 @@
add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
endif()
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ remove_cc_flag("-Wunused-parameter")
+ remove_cc_flag("-Wunused-variable")
+ remove_cc_flag("-Werror")
+ endif()
+
if(MSVC)
# TODO
endif()
Modified: branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
2012-06-28 14:18:04 UTC (rev 48375)
+++ branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
2012-06-28 14:19:53 UTC (rev 48376)
@@ -29,33 +29,33 @@
#include "../MEM_guardedalloc.h"
/* not default but can be used when needing to set a string */
-void *operator new(size_t size, const char *str)
+void *operator new(size_t size, const char *str) throw(std::bad_alloc)
{
return MEM_mallocN(size, str);
}
-void *operator new[](size_t size, const char *str)
+void *operator new[](size_t size, const char *str) throw(std::bad_alloc)
{
return MEM_mallocN(size, str);
}
-void *operator new(size_t size)
+void *operator new(size_t size) throw(std::bad_alloc)
{
return MEM_mallocN(size, "C++/anonymous");
}
-void *operator new[](size_t size)
+void *operator new[](size_t size) throw(std::bad_alloc)
{
return MEM_mallocN(size, "C++/anonymous[]");
}
-void operator delete(void *p)
+void operator delete(void *p) throw()
{
/* delete NULL is valid in c++ */
if (p)
MEM_freeN(p);
}
-void operator delete[](void *p)
+void operator delete[](void *p) throw()
{
/* delete NULL is valid in c++ */
if (p)
Modified:
branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
2012-06-28 14:18:04 UTC (rev 48375)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
2012-06-28 14:19:53 UTC (rev 48376)
@@ -50,12 +50,12 @@
/**
* @brief datatype of this MemoryProxy
*/
- DataType m_datatype;
+ /* DataType m_datatype; */ /* UNUSED */
/**
* @brief channel information of this buffer
*/
- ChannelInfo m_channelInfo[COM_NUMBER_OF_CHANNELS];
+ /* ChannelInfo m_channelInfo[COM_NUMBER_OF_CHANNELS]; */ /* UNUSED */
/**
* @brief the allocated memory
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
2012-06-28 14:18:04 UTC (rev 48375)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
2012-06-28 14:19:53 UTC (rev 48376)
@@ -27,8 +27,9 @@
#include "RE_pipeline.h"
}
-BlurBaseOperation::BlurBaseOperation(DataType data_type=COM_DT_COLOR) :
NodeOperation()
+BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation()
{
+ /* data_type is almost always COM_DT_COLOR except for alpha-blur */
this->addInputSocket(data_type);
this->addInputSocket(COM_DT_VALUE);
this->addOutputSocket(data_type);
Modified:
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
===================================================================
---
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
2012-06-28 14:18:04 UTC (rev 48375)
+++
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ChannelMatteOperation.h
2012-06-28 14:19:53 UTC (rev 48376)
@@ -32,7 +32,7 @@
private:
SocketReader *m_inputImageProgram;
- int m_color_space; /* node->custom1 */
+ /* int m_color_space; */ /* node->custom1 */ /* UNUSED */ /* TODO ? */
int m_matte_channel; /* node->custom2 */
int m_limit_method; /* node->algorithm */
int m_limit_channel; /* node->channel */
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-48370
+ /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-48375
Modified: branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
2012-06-28 14:18:04 UTC (rev 48375)
+++ branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
2012-06-28 14:19:53 UTC (rev 48376)
@@ -1346,7 +1346,7 @@
glBegin(GL_LINES);
for (; start < v2d->cur.xmax; start += lstep, ++i) {
- if (i == 0 || (level < totlevels-1 && i % level_size ==
0))
+ if (i == 0 || (level < totlevels - 1 && i % level_size
== 0))
continue;
glVertex2f(start, v2d->cur.ymin);
glVertex2f(start, v2d->cur.ymax);
@@ -1356,14 +1356,14 @@
start = i * lstep;
for (; start < v2d->cur.ymax; start += lstep, ++i) {
- if (i == 0 || (level < totlevels-1 && i % level_size ==
0))
+ if (i == 0 || (level < totlevels - 1 && i % level_size
== 0))
continue;
glVertex2f(v2d->cur.xmin, start);
glVertex2f(v2d->cur.xmax, start);
}
/* X and Y axis */
- UI_ThemeColorShade(TH_BACK, offset-8);
+ UI_ThemeColorShade(TH_BACK, offset - 8);
glVertex2f(0.0f, v2d->cur.ymin);
glVertex2f(0.0f, v2d->cur.ymax);
glVertex2f(v2d->cur.xmin, 0.0f);
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-48370
+
/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-48375
Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform.c
2012-06-28 14:18:04 UTC (rev 48375)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform.c
2012-06-28 14:19:53 UTC (rev 48376)
@@ -4992,6 +4992,7 @@
BMEditMesh *em = sld->em;
SmallHash visit;
int i;
+ short has_uv;
if (!em)
return;
@@ -5004,6 +5005,8 @@
if (em->bm->shapenr > 1)
return;
+ has_uv = CustomData_has_layer(&(em->bm->ldata), CD_MLOOPUV);
+
BLI_smallhash_init(&visit);
for (i = 0, sv = sld->sv; i < sld->totsv; sv++, i++) {
@@ -5011,8 +5014,6 @@
BMFace *f;
BMIter liter_v;
BMLoop *l_v;
- float uv_med[2] = {0.0, 0.0};
- int tot_loops = 0;
/* BMESH_TODO, this interpolates between vertex/loops which are
not moved
* (are only apart of a face attached to a slide vert),
couldn't we iterate BM_LOOPS_OF_VERT
@@ -5141,17 +5142,22 @@
/* make sure every loop of the vertex has identical uv data.
Use this temporarily to
* fix #31581 until proper data correction/ support for islands
is done */
- BM_ITER_ELEM (l_v, &liter_v, sv->v, BM_LOOPS_OF_VERT) {
- MLoopUV *uv = CustomData_bmesh_get(&em->bm->ldata,
l_v->head.data, CD_MLOOPUV);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
