Revision: 36259
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36259
Author: campbellbarton
Date: 2011-04-21 05:49:47 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
minor changes
- remove some warnings
- fix typos
- cmake allow in-source build (when WITH_IN_SOURCE_BUILD is defined)
- cmake, use an explicit list of rna files (don't glob)
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/BLI_math_geom.h
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/util/crazyspace.c
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/intern/bpy_util.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-04-21 01:21:28 UTC (rev 36258)
+++ trunk/blender/CMakeLists.txt 2011-04-21 05:49:47 UTC (rev 36259)
@@ -31,15 +31,20 @@
# build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-message(FATAL_ERROR "CMake generation for blender is not allowed within the
source directory!
-Remove the CMakeCache.txt file and try again from another folder, e.g.:
-
- rm CMakeCache.txt
- cd ..
- mkdir cmake-make
- cd cmake-make
- cmake ../blender
-")
+ if(NOT DEFINED WITH_IN_SOURCE_BUILD)
+ message(FATAL_ERROR
+ "CMake generation for blender is not allowed within the
source directory!"
+ "\n Remove the CMakeCache.txt file and try again from
another folder, e.g.:"
+ "\n "
+ "\n rm CMakeCache.txt"
+ "\n cd .."
+ "\n mkdir cmake-make"
+ "\n cd cmake-make"
+ "\n cmake ../blender"
+ "\n "
+ "\n Alternately define WITH_IN_SOURCE_BUILD to force
this option (not recommended!)"
+ )
+ endif()
endif()
cmake_minimum_required(VERSION 2.8)
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2011-04-21
01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2011-04-21
05:49:47 UTC (rev 36259)
@@ -187,7 +187,7 @@
}
/* most simple meta-element adding function
- * dont do context menipulation here (rna uses) */
+ * don't do context manipulation here (rna uses) */
MetaElem *add_metaball_element(MetaBall *mb, const int type)
{
MetaElem *ml= MEM_callocN(sizeof(MetaElem), "metaelem");
@@ -237,14 +237,14 @@
/** Compute bounding box of all MetaElems/MetaBalls.
*
* Bounding box is computed from polygonized surface. Object *ob is
- * basic MetaBall (usaualy with name Meta). All other MetaBalls (whith
+ * basic MetaBall (usually with name Meta). All other MetaBalls (with
* names Meta.001, Meta.002, etc) are included in this Bounding Box.
*/
void tex_space_mball(Object *ob)
{
DispList *dl;
BoundBox *bb;
- float *data, min[3], max[3], loc[3], size[3];
+ float *data, min[3], max[3] /*, loc[3], size[3] */;
int tot, doit=0;
if(ob->bb==NULL) ob->bb= MEM_callocN(sizeof(BoundBox), "mb boundbox");
@@ -272,7 +272,7 @@
min[0] = min[1] = min[2] = -1.0f;
max[0] = max[1] = max[2] = 1.0f;
}
-
+ /*
loc[0]= (min[0]+max[0])/2.0f;
loc[1]= (min[1]+max[1])/2.0f;
loc[2]= (min[2]+max[2])/2.0f;
@@ -280,7 +280,7 @@
size[0]= (max[0]-min[0])/2.0f;
size[1]= (max[1]-min[1])/2.0f;
size[2]= (max[2]-min[2])/2.0f;
-
+ */
boundbox_set_from_min_max(bb, min, max);
}
@@ -320,14 +320,14 @@
}
/* Note on mball basis stuff 2.5x (this is a can of worms)
- * This really needs a rewrite/refactorm its totally broken in anything other
then basic cases
+ * This really needs a rewrite/refactor its totally broken in anything other
then basic cases
* Multiple Scenes + Set Scenes & mixing mball basis SHOULD work but fails to
update the depsgraph on rename
* and linking into scenes or removal of basis mball. so take care when
changing this code.
*
* Main idiot thing here is that the system returns find_basis_mball() objects
which fail a is_basis_mball() test.
*
- * Not only that but the depsgraph and ther areas depend on this behavior!, so
making small fixes here isnt worth it.
- * - campbell
+ * Not only that but the depsgraph and their areas depend on this behavior!,
so making small fixes here isn't worth it.
+ * - Campbell
*/
@@ -725,7 +725,7 @@
cur= indices+4*curindex;
- /* diplists now support array drawing, we treat trias as fake quad */
+ /* displists now support array drawing, we treat tri's as fake quad */
cur[0]= i1;
cur[1]= i2;
@@ -1315,7 +1315,7 @@
dy = pos.y - neg.y;
dz = pos.z - neg.z;
-/* Aproximation by linear interpolation is faster then binary subdivision,
+/* Approximation by linear interpolation is faster then binary subdivision,
* but it results sometimes (mb->thresh < 0.2) into the strange results */
if((mb->thresh > 0.2f) && (f==1)){
if((dy == 0.0f) && (dz == 0.0f)){
@@ -1625,7 +1625,7 @@
}
}
- /* when metaball object hase zero scale, then MetaElem
ot this MetaBall
+ /* when metaball object has zero scale, then MetaElem
to this MetaBall
* will not be put to mainb array */
if(bob->size[0]==0.0f || bob->size[1]==0.0f ||
bob->size[2]==0.0f) {
zero_size= 1;
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-04-21
01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-04-21
05:49:47 UTC (rev 36259)
@@ -2627,7 +2627,7 @@
if (!text) return;
if (!text->curl) return;
- if (!text->sell) return;// Need to change this need to check if only
one line is selected ot more then one
+ if (!text->sell) return;// Need to change this need to check if only
one line is selected to more then one
num = 0;
while (TRUE)
Modified: trunk/blender/source/blender/blenlib/BLI_math_geom.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_geom.h 2011-04-21
01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/blenlib/BLI_math_geom.h 2011-04-21
05:49:47 UTC (rev 36259)
@@ -86,10 +86,10 @@
* 2 - i1 and i2 are the nearest points on line 1 (v1, v2) and line 2 (v3, v4)
respectively
* */
-int isect_line_line_v3(float v1[3], float v2[3],
- float v3[3], float v4[3], float i1[3], float i2[3]);
-int isect_line_line_strict_v3(float v1[3], float v2[3],
- float v3[3], float v4[3], float vi[3], float *lambda);
+int isect_line_line_v3(const float v1[3], const float v2[3],
+ const float v3[3], const float v4[3], float i1[3], float i2[3]);
+int isect_line_line_strict_v3(const float v1[3], const float v2[3],
+ const float v3[3], const float v4[3], float vi[3], float *lambda);
/* line/ray triangle */
int isect_line_tri_v3(const float p1[3], const float p2[3],
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-04-21
01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-04-21
05:49:47 UTC (rev 36259)
@@ -897,7 +897,7 @@
* 1 - lines are coplanar, i1 is set to intersection
* 2 - i1 and i2 are the nearest points on line 1 (v1, v2) and line 2 (v3, v4)
respectively
* */
-int isect_line_line_v3(float v1[3], float v2[3], float v3[3], float v4[3],
float i1[3], float i2[3])
+int isect_line_line_v3(const float v1[3], const float v2[3], const float
v3[3], const float v4[3], float i1[3], float i2[3])
{
float a[3], b[3], c[3], ab[3], cb[3], dir1[3], dir2[3];
float d;
@@ -961,7 +961,7 @@
/* Intersection point strictly between the two lines
* 0 when no intersection is found
* */
-int isect_line_line_strict_v3(float v1[3], float v2[3], float v3[3], float
v4[3], float vi[3], float *lambda)
+int isect_line_line_strict_v3(const float v1[3], const float v2[3], const
float v3[3], const float v4[3], float vi[3], float *lambda)
{
float a[3], b[3], c[3], ab[3], cb[3], ca[3], dir1[3], dir2[3];
float d;
Modified: trunk/blender/source/blender/editors/animation/keyframes_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_edit.c
2011-04-21 01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/editors/animation/keyframes_edit.c
2011-04-21 05:49:47 UTC (rev 36259)
@@ -515,7 +515,7 @@
/* run the given check on the 3 handles
* - check should be a macro, which takes the handle index as its single
arg, which it substitutes later
- * - requires that a var, of type short, is named 'ok', and has been
initialised ot 0
+ * - requires that a var, of type short, is named 'ok', and has been
initialized to 0
*/
#define KEYFRAME_OK_CHECKS(check) \
{ \
Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c
2011-04-21 01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/editors/space_node/space_node.c
2011-04-21 05:49:47 UTC (rev 36259)
@@ -232,7 +232,7 @@
if(type==NTREE_COMPOSIT) {
Scene *scene=
wmn->window->screen->scene;
- /* note that NodeTagIDChanged is alredy
called by BKE_image_signal() on all
+ /* note that NodeTagIDChanged is
already called by BKE_image_signal() on all
* scenes so really this is just to
know if the images is used in the compo else
* painting on images could become very
slow when the compositor is open. */
if(NodeTagIDChanged(scene->nodetree,
wmn->reference))
Modified: trunk/blender/source/blender/editors/util/crazyspace.c
===================================================================
--- trunk/blender/source/blender/editors/util/crazyspace.c 2011-04-21
01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/editors/util/crazyspace.c 2011-04-21
05:49:47 UTC (rev 36259)
@@ -400,7 +400,7 @@
if(!modifier_isEnabled(scene, md,
eModifierMode_Realtime)) continue;
if(mti->type==eModifierTypeType_OnlyDeform) {
- /* skip leading modifiers which have been alredy
+ /* skip leading modifiers which have been
already
handled in sculpt_get_first_deform_matrices
*/
if(mti->deformMatrices && !deformed)
continue;
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-04-21
01:21:28 UTC (rev 36258)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-04-21
05:49:47 UTC (rev 36259)
@@ -30,11 +30,86 @@
# message(STATUS "Configuring makesrna")
-file(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
-file(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c")
-list(REMOVE_ITEM DEFSRC rna_access.c rna_define.c makesrna.c)
-list(REMOVE_ITEM DEFSRC ${APISRC})
-
+# files rna_access.c rna_define.c makesrna.c intentionally excluded.
+set(DEFSRC
+ rna_ID.c
+ rna_action.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
