Blender Git Commits

cpifdiff.sh died with an error when $(LCGDIR)/$(LIBNAME)/include/blenkey.h
didn't exist instead of installing it as it should.

- @../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/blenkey.h
+ @../tools/cpifdiff.sh blenkey.h $(LCGDIR)/$(LIBNAME)/include/

sgefant

- use ODE in lib/ for FreeBSD
- use default python library path
- remove obsolete SSR comments

- replaced #elif with more correct version:

< #elif _WIN32
---
> #elif defined(_WIN32)

libfrozen will be built only once until one of the python files is changed.

Michel

- replaced files with the original versions that also contain 32x32 and
8 bit icons.

- on windows alcGetError() has no arguments. On other platforms it does.

- we're using python22.lib instead of python20.lib nowadays

- when compiling on windows, override CC=gcc with CC=..../cl_wrapper.pl
and use the Python.h in the lib/windows/python/include directory.
MSVC++ doesn't like linking with a gcc compiled frozen library.

Workaround for the header file copying dependency hell

and the other FreeBSD python locations.

another FreeBSD python location change

start using platform default locations for FreeBSD.
try not to break anything for other platforms.

Use FreeBSD's default python location when on FreeBSD

Start using platform default locations of libraries that used to be in
lib/ and came from extern/ (which isn't in the new repository at all)

So use stuff like:

ifeq ($(OS),freebsd)
export NAN_OPENSSL ?= /usr
else
export NAN_OPENSSL ?= $(LCGDIR)/openssl
endif

Hans

These updates enable the build of the gameengine
(configure --enable-gameengine). However, you still need to manually configure,
compile and install ode.

* Following the original NaN makefile, I removed the TerraplayNetwork files
from the build. (Moved the two files to EXTRA_DIST).

* Pass a const char * to Py_BuildValue instead of a STR_String in
BL_ActionActuator.cpp

* Added some include directories in Makefile.am's

Michel

Added the following prototype to get rid of another warning:
void pub_priv_test(char *HexPriv, char *HexPub);

Kent

Two small updates to fix warnings.

The first is renaming fv_data to fv_data2 to get rid of a shadow warning
second is an unused var that was an extra uneeded call to fabs.

Diff included:

Kent
--
mein@cs.umn.edu

Index: BSP_CSGMeshBuilder.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_CSGMeshBuilder.cpp,v
retrieving revision 1.3
diff -u -r1.3 BSP_CSGMeshBuilder.cpp
--- BSP_CSGMeshBuilder.cpp 25 Nov 2002 09:52:48 -0000 1.3
+++ BSP_CSGMeshBuilder.cpp 3 Jan 2003 15:47:15 -0000
@@ -89,13 +89,13 @@
}

if (props.user_face_vertex_data_size) {
- char * fv_data = NULL;
- fv_data = new char[4 * props.user_face_vertex_data_size];
+ char * fv_data2 = NULL;
+ fv_data2 = new char[4 * props.user_face_vertex_data_size];

- face.user_face_vertex_data[0] = fv_data;
- face.user_face_vertex_data[1] = fv_data + props.user_face_vertex
_data_size;
- face.user_face_vertex_data[2] = fv_data + 2*props.user_face_vert
ex_data_size;
- face.user_face_vertex_data[3] = fv_data + 3*props.user_face_vert
ex_data_size;
+ face.user_face_vertex_data[0] = fv_data2;
+ face.user_face_vertex_data[1] = fv_data2 + props.user_face_verte
x_data_size;
+ face.user_face_vertex_data[2] = fv_data2 + 2*props.user_face_ver
tex_data_size;
+ face.user_face_vertex_data[3] = fv_data2 + 3*props.user_face_ver
tex_data_size;
} else {
face.user_face_vertex_data[0] = NULL;
face.user_face_vertex_data[1] = NULL;
[9:47] ~/blender/intern/bsp/intern(mein@captcrab) % cvs diff BSP_MeshFragment.cp
p
Index: BSP_MeshFragment.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/bsp/intern/BSP_MeshFragment.cpp,v
retrieving revision 1.3
diff -u -r1.3 BSP_MeshFragment.cpp
--- BSP_MeshFragment.cpp 25 Nov 2002 09:52:48 -0000 1.3
+++ BSP_MeshFragment.cpp 3 Jan 2003 15:47:21 -0000
@@ -106,8 +106,6 @@
if (BSP_Classification(vert.OpenTag()) == e_unclassified)
{
MT_Scalar sdistance = plane.signedDistance(vert.m_pos);
- MT_Scalar fsdistance = fabs(sdistance);
-
if (fabs(sdistance) <= BSP_SPLIT_EPSILON) {
// this vertex is on
vert.SetOpenTag(e_classified_on);

Added fix for invisible size widget on OSX.
It's still behind a define because it does not work with
blender (player and gears work fine).
Maarten

Added mouse down event when window was activated by
clicking on it. The mouse up was already generated. They
are now balanced by mouse downs. The behaviour of the
OSX target now matches that of the WIN32 target.
Maarten

Fix for lots of window size events during window drag
Maarten