[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50618] branches/soc-2011-tomato: Merging r50602 through r50617 form trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sat Sep 15 08:24:49 CEST 2012
Revision: 50618
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50618
Author: nazgul
Date: 2012-09-15 06:24:48 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Merging r50602 through r50617 form trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50602
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50617
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2011-tomato/intern/mikktspace/mikktspace.c
branches/soc-2011-tomato/intern/raskter/raskter.c
branches/soc-2011-tomato/intern/utfconv/utfconv.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color.c
branches/soc-2011-tomato/source/blender/blenlib/intern/md5.c
branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-tomato/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2011-tomato/source/blender/collada/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/armature/poseobject.c
branches/soc-2011-tomato/source/blender/editors/include/ED_mask.h
branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
branches/soc-2011-tomato/source/blender/editors/include/ED_util.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/io/io_ops.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_editaction.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer_dv.c
branches/soc-2011-tomato/source/blender/imbuf/intern/util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.h
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.h
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.h
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_ffmpeg.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface_atexit.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.h
branches/soc-2011-tomato/source/blender/python/intern/gpu.c
branches/soc-2011-tomato/source/blender/python/intern/stubs.c
branches/soc-2011-tomato/source/blender/render/intern/include/zbuf.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/texture_ocean.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2011-tomato/source/creator/creator.c
Added Paths:
-----------
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_object_info.osl
branches/soc-2011-tomato/intern/cycles/kernel/osl/nodes/node_particle_info.osl
branches/soc-2011-tomato/source/blender/python/intern/bpy_library.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/build_files/cmake/cmake_static_check_smatch.py
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-50601
+ /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-50617
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-09-15 06:10:48 UTC (rev 50617)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-09-15 06:24:48 UTC (rev 50618)
@@ -1716,9 +1716,10 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_CAST_ALIGN -Wcast-align)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
# system headers sometimes do this, disable for now, was: -Werror=strict-prototypes
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
@@ -1752,10 +1753,13 @@
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ # strange, clang complains these are not supported, but then yses them.
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_MISSING_PROTOTYPES -Wmissing-prototypes)
ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS C_WARN_ALL -Wall)
ADD_CHECK_C_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
Property changes on: branches/soc-2011-tomato/build_files/cmake/cmake_static_check_smatch.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-09-15 06:10:48 UTC (rev 50617)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-09-15 06:24:48 UTC (rev 50618)
@@ -476,6 +476,7 @@
if(CMAKE_COMPILER_IS_GNUCC)
remove_cc_flag("-Wstrict-prototypes")
+ remove_cc_flag("-Wmissing-prototypes")
remove_cc_flag("-Wunused-parameter")
remove_cc_flag("-Wwrite-strings")
remove_cc_flag("-Wundef")
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp 2012-09-15 06:10:48 UTC (rev 50617)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_C-API.cpp 2012-09-15 06:24:48 UTC (rev 50618)
@@ -99,11 +99,11 @@
#include "AUD_C-API.h"
#ifndef NULL
-#define NULL 0
+# define NULL (void *)0
#endif
static AUD_Reference<AUD_IDevice> AUD_device;
-static AUD_I3DDevice* AUD_3ddevice;
+static AUD_I3DDevice *AUD_3ddevice;
void AUD_initOnce()
{
@@ -116,13 +116,12 @@
{
AUD_Reference<AUD_IDevice> dev;
- if(!AUD_device.isNull())
+ if (!AUD_device.isNull()) {
AUD_exit();
+ }
- try
- {
- switch(device)
- {
+ try {
+ switch(device) {
case AUD_NULL_DEVICE:
dev = new AUD_NULLDevice();
break;
@@ -140,8 +139,7 @@
case AUD_JACK_DEVICE:
#ifdef __APPLE__
struct stat st;
- if(stat("/Library/Frameworks/Jackmp.framework", &st) != 0)
- {
+ if (stat("/Library/Frameworks/Jackmp.framework", &st) != 0) {
printf("Warning: Jack Framework not installed\n");
// No break, fall through to default, to return false
}
@@ -159,7 +157,7 @@
}
AUD_device = dev;
- AUD_3ddevice = dynamic_cast<AUD_I3DDevice*>(AUD_device.get());
+ AUD_3ddevice = dynamic_cast<AUD_I3DDevice *>(AUD_device.get());
return true;
}
@@ -176,48 +174,44 @@
}
#ifdef WITH_PYTHON
-static PyObject* AUD_getCDevice(PyObject* self)
+static PyObject *AUD_getCDevice(PyObject *self)
{
- if(!AUD_device.isNull())
- {
- Device* device = (Device*)Device_empty();
- if(device != NULL)
- {
+ if (!AUD_device.isNull()) {
+ Device *device = (Device *)Device_empty();
+ if (device != NULL) {
device->device = new AUD_Reference<AUD_IDevice>(AUD_device);
- return (PyObject*)device;
+ return (PyObject *)device;
}
}
Py_RETURN_NONE;
}
-static PyMethodDef meth_getcdevice[] = {{ "device", (PyCFunction)AUD_getCDevice, METH_NOARGS,
- "device()\n\n"
- "Returns the application's :class:`Device`.\n\n"
- ":return: The application's :class:`Device`.\n"
- ":rtype: :class:`Device`"}};
+static PyMethodDef meth_getcdevice[] = {
+ {"device", (PyCFunction)AUD_getCDevice, METH_NOARGS,
+ "device()\n\n"
+ "Returns the application's :class:`Device`.\n\n"
+ ":return: The application's :class:`Device`.\n"
+ ":rtype: :class:`Device`"}
+};
extern "C" {
-extern void* sound_get_factory(void* sound);
+extern void *sound_get_factory(void *sound);
}
-static PyObject* AUD_getSoundFromPointer(PyObject* self, PyObject* args)
+static PyObject *AUD_getSoundFromPointer(PyObject *self, PyObject *args)
{
long int lptr;
- if(PyArg_Parse(args, "l:_sound_from_pointer", &lptr))
- {
- if(lptr)
- {
- AUD_Reference<AUD_IFactory>* factory = (AUD_Reference<AUD_IFactory>*) sound_get_factory((void*) lptr);
+ if (PyArg_Parse(args, "l:_sound_from_pointer", &lptr)) {
+ if (lptr) {
+ AUD_Reference<AUD_IFactory>* factory = (AUD_Reference<AUD_IFactory>*) sound_get_factory((void *) lptr);
- if(factory)
- {
- Factory* obj = (Factory*) Factory_empty();
- if(obj)
- {
+ if (factory) {
+ Factory *obj = (Factory *)Factory_empty();
+ if (obj) {
obj->factory = new AUD_Reference<AUD_IFactory>(*factory);
- return (PyObject*) obj;
+ return (PyObject *) obj;
}
}
}
@@ -226,44 +220,44 @@
Py_RETURN_NONE;
}
-static PyMethodDef meth_sound_from_pointer[] = {{ "_sound_from_pointer", (PyCFunction)AUD_getSoundFromPointer, METH_O,
- "_sound_from_pointer(pointer)\n\n"
- "Returns the corresponding :class:`Factory` object.\n\n"
- ":arg pointer: The pointer to the bSound object as long.\n"
- ":type pointer: long\n"
- ":return: The corresponding :class:`Factory` object.\n"
- ":rtype: :class:`Factory`"}};
+static PyMethodDef meth_sound_from_pointer[] = {
+ {"_sound_from_pointer", (PyCFunction)AUD_getSoundFromPointer, METH_O,
+ "_sound_from_pointer(pointer)\n\n"
+ "Returns the corresponding :class:`Factory` object.\n\n"
+ ":arg pointer: The pointer to the bSound object as long.\n"
+ ":type pointer: long\n"
+ ":return: The corresponding :class:`Factory` object.\n"
+ ":rtype: :class:`Factory`"}
+};
-PyObject* AUD_initPython()
+PyObject *AUD_initPython()
{
- PyObject* module = PyInit_aud();
- PyModule_AddObject(module, "device", (PyObject*)PyCFunction_New(meth_getcdevice, NULL));
- PyModule_AddObject(module, "_sound_from_pointer", (PyObject*)PyCFunction_New(meth_sound_from_pointer, NULL));
+ PyObject *module = PyInit_aud();
+ PyModule_AddObject(module, "device", (PyObject *)PyCFunction_New(meth_getcdevice, NULL));
+ PyModule_AddObject(module, "_sound_from_pointer", (PyObject *)PyCFunction_New(meth_sound_from_pointer, NULL));
PyDict_SetItemString(PyImport_GetModuleDict(), "aud", module);
return module;
}
-void* AUD_getPythonFactory(AUD_Sound* sound)
+void *AUD_getPythonFactory(AUD_Sound *sound)
{
- if(sound)
- {
- Factory* obj = (Factory*) Factory_empty();
- if(obj)
- {
+ if (sound) {
+ Factory *obj = (Factory *) Factory_empty();
+ if (obj) {
obj->factory = new AUD_Reference<AUD_IFactory>(*sound);
- return (PyObject*) obj;
+ return (PyObject *) obj;
}
}
return NULL;
}
-AUD_Sound* AUD_getPythonSound(void* sound)
+AUD_Sound *AUD_getPythonSound(void *sound)
{
- Factory* factory = checkFactory((PyObject *)sound);
+ Factory *factory = checkFactory((PyObject *)sound);
- if(!factory)
+ if (!factory)
return NULL;
return new AUD_Reference<AUD_IFactory>(*reinterpret_cast<AUD_Reference<AUD_IFactory>*>(factory->factory));
@@ -281,7 +275,7 @@
AUD_device->unlock();
}
-AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
+AUD_SoundInfo AUD_getInfo(AUD_Sound *sound)
{
assert(sound);
@@ -290,12 +284,10 @@
info.specs.rate = AUD_RATE_INVALID;
info.length = 0.0f;
- try
- {
+ try {
AUD_Reference<AUD_IReader> reader = (*sound)->createReader();
- if(!reader.isNull())
- {
+ if (!reader.isNull()) {
info.specs = reader->getSpecs();
info.length = reader->getLength() / (float) info.specs.rate;
}
@@ -307,24 +299,23 @@
return info;
}
-AUD_Sound* AUD_load(const char* filename)
+AUD_Sound *AUD_load(const char *filename)
{
assert(filename);
return new AUD_Sound(new AUD_FileFactory(filename));
}
-AUD_Sound* AUD_loadBuffer(unsigned char* buffer, int size)
+AUD_Sound *AUD_loadBuffer(unsigned char *buffer, int size)
{
assert(buffer);
return new AUD_Sound(new AUD_FileFactory(buffer, size));
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list