[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52769] trunk/blender: missed a file from last commit.
Campbell Barton
ideasman42 at gmail.com
Tue Dec 4 15:46:56 CET 2012
Revision: 52769
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52769
Author: campbellbarton
Date: 2012-12-04 14:46:55 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
missed a file from last commit. also remove M_PI define from constraint.c
Modified Paths:
--------------
trunk/blender/intern/locale/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/editors/object/object_relations.c
Modified: trunk/blender/intern/locale/CMakeLists.txt
===================================================================
--- trunk/blender/intern/locale/CMakeLists.txt 2012-12-04 14:43:42 UTC (rev 52768)
+++ trunk/blender/intern/locale/CMakeLists.txt 2012-12-04 14:46:55 UTC (rev 52769)
@@ -32,6 +32,8 @@
set(SRC
boost_locale_wrapper.cpp
+
+ boost_locale_wrapper.h
)
if(WITH_INTERNATIONAL)
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-12-04 14:43:42 UTC (rev 52768)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2012-12-04 14:46:55 UTC (rev 52769)
@@ -84,15 +84,9 @@
#include "BKE_movieclip.h"
#ifdef WITH_PYTHON
-#include "BPY_extern.h"
+# include "BPY_extern.h"
#endif
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-
-
/* ************************ Constraints - General Utilities *************************** */
/* These functions here don't act on any specific constraints, and are therefore should/will
* not require any of the special function-pointers afforded by the relevant constraint
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2012-12-04 14:43:42 UTC (rev 52768)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2012-12-04 14:46:55 UTC (rev 52769)
@@ -643,8 +643,8 @@
/* apply transformation of previous parenting */
if (keep_transform) {
- /* was removed because of bug [#23577],
- * but this can be handy in some cases too [#32616], so make optional */
+ /* was removed because of bug [#23577],
+ * but this can be handy in some cases too [#32616], so make optional */
BKE_object_apply_mat4(ob, ob->obmat, FALSE, FALSE);
}
More information about the Bf-blender-cvs
mailing list