diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-07-25 17:12:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-07-25 17:12:58 +0400 |
| commit | 147a5229a12a9546c4099682b2b49a15ff3ff108 (patch) | |
| tree | 29a07a21a53a2276967574f027c4cc3a126a14fd /intern | |
| parent | d0e3d4a48241ea48576e9569afc80aaa9929ea74 (diff) | |
| parent | cc0f3146e798479be0758b5c152ef67ef42ea8dc (diff) | |
svn merge -r 30566:30717 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/FLUID_3D.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index c51e96f04b5..6b78b0b6bdc 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -63,7 +63,7 @@ extern "C" { #endif - /** Returns the lenght of the allocated memory segment pointed at + /** Returns the length of the allocated memory segment pointed at * by vmemh. If the pointer was not previously allocated by this * module, the result is undefined.*/ size_t MEM_allocN_len(void *vmemh); diff --git a/intern/smoke/intern/FLUID_3D.h b/intern/smoke/intern/FLUID_3D.h index ab121ef506e..6ca50b2c032 100644 --- a/intern/smoke/intern/FLUID_3D.h +++ b/intern/smoke/intern/FLUID_3D.h @@ -30,6 +30,7 @@ #include <cstdlib> #include <cmath> +#include <cstring> #include <iostream> #include "OBSTACLE.h" // #include "WTURBULENCE.h" |