svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00
parent 4c66e696fb 61596d5bb3
commit 48006292d8
717 changed files with 4737 additions and 3105 deletions
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -2,8 +2,8 @@
 *  \ingroup eduv
 */

-#ifndef __PARAMETRIZER_H__
-#define __PARAMETRIZER_H__
+#ifndef __UVEDIT_PARAMETRIZER_H__
+#define __UVEDIT_PARAMETRIZER_H__

 #ifdef __cplusplus
 extern "C" {
@@ -98,5 +98,5 @@ void param_flush_restore(ParamHandle *handle);
 }
 #endif

-#endif /*__PARAMETRIZER_H__*/
+#endif /*__UVEDIT_PARAMETRIZER_H__*/