Commit Graph

63 Commits

Author SHA1 Message Date
e49aeb8468 In stubs.c I added a dummy return to functions that were non void types.
in readfile.c I renamed some localvars that were named main to mainl in
a couple of functions.

in action.c I initalized a var to 0.  This is probably not needed but
its a little safer incase someone adds more modes...
I've included a diff of this last one below.

Kent

Index: action.c
===================================================================
RCS file: /cvs01/blender/source/blender/blenkernel/intern/action.c,v
retrieving revision 1.6
diff -u -r1.6 action.c
--- action.c    2002/11/25 12:01:52     1.6
+++ action.c    2002/12/20 02:06:27
@@ -153,7 +153,7 @@
 ){
        bConstraint *dcon;
        const bConstraint *scon;
-       float dstweight;
+       float dstweight = 0;

        switch (mode){
        case POSE_BLEND:
2002-12-20 02:08:46 +00:00
cf13c60fa4 Two more variables that were not initalized.
cvs diff included below.

Kent
--
mein@cs.umn.edu

Index: png_encode.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/png_encode.c,v
retrieving revision 1.3
diff -u -r1.3 png_encode.c
--- png_encode.c        2002/11/25 12:02:00     1.3
+++ png_encode.c        2002/12/20 01:28:18
@@ -91,7 +91,7 @@
        unsigned char *pixels = 0;
        unsigned char *from, *to;
        png_bytepp row_pointers = 0;
-       int i, bytesperpixel, color_type;
+       int i, bytesperpixel, color_type = PNG_COLOR_TYPE_GRAY;
        FILE *fp = 0;

Index: targa.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/targa.c,v
retrieving revision 1.3
diff -u -r1.3 targa.c
--- targa.c     2002/11/25 12:02:00     1.3
+++ targa.c     2002/12/20 01:28:20
@@ -247,7 +247,7 @@
        char buf[20];
        FILE *fildes;
        int i;
-       short ok;
+       short ok = 0;
2002-12-20 01:29:14 +00:00
14819414e9 Ok since no one cares about this I put a 5 second fix on it and won't
worry about it anymore :)

(initalized it to 0 and then later return 0 if its still 0 before doing
the work)

Kent
--
mein@cs.umn.edu
2002-12-20 01:14:46 +00:00
734e358eb4 Fixed two uninitalized vars:
Kent

 /cvs01/blender/source/blender/imbuf/intern/iris.c,v
retrieving revision 1.3
diff -u -r1.3 iris.c
--- iris.c      2002/11/25 12:02:00     1.3
+++ iris.c      2002/12/19 22:12:53
@@ -212,7 +212,7 @@
 /*  unsigned int *tab; */
 /*  int len; */
 {
-       int r;
+       int r = 0;

        while(len) {
                r = putlong(outf,*tab++);
@@ -548,7 +548,7 @@
 {
        FILE *outf;
        IMAGE *image;
-       int tablen, y, z, pos, len;
+       int tablen, y, z, pos, len = 0;
        int *starttab, *lengthtab;
        unsigned char *rlebuf;
2002-12-19 22:13:37 +00:00
59cee3c47f Added the the magic compiler flag that will turn on game-engine integration with Blender. The line is commented by default as was discussed on the list.
Maarten
2002-12-19 22:06:32 +00:00
f8ef881474 I initalized mask to 0 in IMB_converttocmap
This may not be correct but at least now its predictable.

Kent
2002-12-19 21:26:34 +00:00
ac699ba672 Used NAN_ODE to point to the ode lib location.
Maarten
2002-12-19 21:14:18 +00:00
d417a42673 Overrided NAN_ODE in OSX to point to the precompiled ode lib in the lib tree.
Maarten
2002-12-19 21:12:58 +00:00
eb12ae40dc Removed Ode build from OSX target.
This is now replaced by the Ode lib in CVS.
Maarten
2002-12-16 22:31:50 +00:00
d374995374 This might be a slight hack but Iksolver library was complaining about
some linking stuff that was in libmoto.a so I added a libmoto after it
in the link lines.

Hans got a better way to do this? :)

Kent

Here is the diff:
RCS file: /cvs01/blender/source/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    2002/11/13 16:09:38     1.12
+++ Makefile    2002/12/13 20:28:13
@@ -165,6 +165,7 @@
     COMLIB += $(NAN_PNG)/lib/libpng.a

     BCLIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+    BCLIB += $(NAN_MOTO)/lib/libmoto.a
     BCLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     BCLIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
     BCLIB += $(OCGDIR)/blender/writestreamglueSTUB/$(DEBUG_DIR)libwritestreamglueSTUB.a
@@ -174,6 +175,7 @@
     BCLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrccreator.a

     PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
+    PULIB += $(NAN_MOTO)/lib/libmoto.a
     PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
     PULIB += $(OCGDIR)/blender/readstreamglue/$(DEBUG_DIR)libreadstreamglue.a
     PULIB += $(OCGDIR)/blender/writestreamglue/$(DEBUG_DIR)libwritestreamglue.a
2002-12-13 20:30:07 +00:00
a64f137a37 Had to add a function (BPY_call_importloader) and a variable (bprogname)
to the stubs to get the player linking with Project Builder under OSX.
Maarten
2002-12-12 22:18:25 +00:00
87e588d4c9 compile and run source/blender/makesdna/intern/makesdna to (re)create
source/blender/makesdna/intern/dna.c

This should fix the segfault at startup for non-x86 systems (tested on
linux/ppc and linux/x86). I would be glad if someone could check
if it works on other systems as well.

sgefant
2002-12-10 23:55:59 +00:00
2494b7c9cc don't crash when adding a UVsphere (Hos, heli)
sgefant
2002-12-07 20:57:50 +00:00
cd4a60f536 sgefants patch to remove the License Key stuff.
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...

(Using cscope for LICENSE_KEY_VALID still turns up some stuff)

Kent
--
mein@cs.umn.edu
2002-12-06 19:48:37 +00:00
fd05cdbaad Ok this should have probably been three seperate things but I figured
some people are getting sick of the email and the comments are small.

editmesh.c I added casts in a couple of places to remove a few warnings.

Then I cleaned up configure.ac a bit specifically the checks for
--with-ssl etc... so they work a little nicer.

I also modified source/Makefile.am to add targets for the player
Still needs some work I'm sure but its a start.

Kent
--
mein@cs.umn.edu
2002-12-03 18:31:50 +00:00
50ec450e64 Had to make the patch for casting a little more complicated.
m_MotionState->getWorldOrientation((float)worldquat[1],
        (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);

Is now:

#ifdef dDOUBLE
      m_MotionState->getWorldOrientation((float)worldquat[1],
        (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
#else
      m_MotionState->getWorldOrientation(worldquat[1],
        worldquat[2],worldquat[3],worldquat[0]);
#endif


Kent
--
mein@cs.umn.edu
2002-12-03 15:52:47 +00:00
5b88406c3f I moved source/darwin/blenderpublisher.app to source/darwin/blender.app
or at least tried.
You will probably want to rm -rf source/darwin/blenderpublisher.app

Kent
--
mein@cs.umn.edu
2002-12-03 10:02:40 +00:00
73aef31b52 I got this patch from sgefant Mostly its just casting floats as floats.
(also adding a couple of include pathes)
changes in Ode*.cpp to get it compile with gcc 2.95.4
to make it compile with ./configure --with-gameengine
                        --enable-gameplayer


Kent
--
mein@cs.umn.edu
2002-12-02 16:30:13 +00:00
4950e0e74b wrapped S_ISREG and S_ISDIR with a define to suppress compiler
complaints about redefinitions. These occur now that Python 2.2 is included.
2002-12-01 22:41:22 +00:00
0bc5f2fa3f Changed "www.blender.nl" to "www.blender.org" for that little display
thingy in the upper right corner.

-Fred <phaethon>
2002-12-01 10:52:01 +00:00
07049dda83 Somehow the img directory got lost from the list of include paths
Maarten
2002-11-29 20:51:40 +00:00
651fa32eaa Bunch of small fixes emailed to me from phaethon
Kent
--
mein@cs.umn.edu
2002-11-29 17:07:58 +00:00
3fe6959360 I know this is a bugfix but hey its simple :)
More info on it can be found here:
http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=176

Kent
--
mein@cs.umn.edu
2002-11-27 17:09:40 +00:00
209a2ede2c Last of the config.h mods...
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

added to these files.

Kent
--
mein@cs.umn.edu
2002-11-25 15:29:57 +00:00
d0e346d544 updated .c files to include:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Just need to finish cpp files now :)

Kent
--
mein@cs.umn.edu
2002-11-25 12:02:15 +00:00
b9a19f1ea7 Did all of the .h's in source
(adding)
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

also the Makefile.in's were from previous patch adding
the system depend stuff to configure.ac

Kent
--
mein@cs.umn.edu
2002-11-25 11:16:17 +00:00
3f2f1571e5 added the following to configure.ac
+case "$target" in
+  *sparc* )
+        AC_DEFINE(SUN_OGL_NO_VERTEX_MACROS,1,[Fix for Sun's GL])
+  ;;
+esac
+

Also added the include to the above .c files.
I'm going to add it to everything in source just haven't gotten that far yet.

Kent
2002-11-25 10:13:52 +00:00
d44f2c6dcc Robert Wenzlaff's fix for AVI_JPEGS.
Kent
--
mein@cs.umn.edu
2002-11-22 15:59:38 +00:00
98e307346c Fixed a typo. Had a [ added.
Kent
--
mein@cs.umn.edu
2002-11-19 00:09:54 +00:00
05dd7ff3fb Committing LarstiQ's patch for NAN_PYTHON_BINARY and NAN_MXTEXTTOOLS
It worked on my system and no one else has said anything.

Kent
--
mein@cs.umn.edu
2002-11-13 16:09:38 +00:00
b4c622d4ba bug fix in vrml (inventor) import.
Maarten
2002-11-12 20:12:40 +00:00
d4e488abed Changed -O3 to -O2 under linux 2002-11-11 21:33:11 +00:00
9715aa0436 Converted icon files to binary files (cvs admin -kb) and restored them.
Maarten
2002-11-11 20:57:09 +00:00
a65506a3b5 Fixed action.c (brought it back to 1.2)
Kent
--
mein@cs.umn.edu
2002-11-11 14:46:27 +00:00
50aabf8599 switched the order of build (frozen and intern are now intern and frozen)
that way the lib gets installed before the dir didn't exist so it
died.

Kent
--
mein@cs.umn.edu
2002-11-08 11:36:37 +00:00
fbdf58fe29 I needed to update the path to libfrozen on the linking also
missed it before.

Kent
--
mein@cs.umn.edu
2002-11-08 10:16:47 +00:00
e46a6d2611 I autmated the rest of building libfrozen.a
I also moved it so that it gets put in:
 $(OCGDIR)/blender/bpython/$(DEBUG_DIR)libfrozen.a

and removed the stuff from the readme on how to do it by hand.

(I made one other small change and that was to comment
out the ssr target on solaris and freebsd in source/Makefile
I forgot to commit it yesterday)

Kent
--
mein@cs.umn.edu
2002-11-07 17:47:15 +00:00
97827c21d0 I Just modified the Makefile to use the definitions instead of hard paths.
-CPPFLAGS += -I../../../../sumo/Fuzzics/include
-CPPFLAGS += -I../../../../sumo/include
+CPPFLAGS += -I$(NAN_FUZZICS)/include
+CPPFLAGS += -I$(NAN_SUMO)/include

Kent
--
mein@cs.umn.edu
2002-11-06 02:09:02 +00:00
2d5514be28 Brought back the sumo physics controllers and undid game engine make file
changes.
Instead modified the top level nan_definitions.mk to point the NAN_SUMO and
NAN_FUZZICS to the right locations.
Maarten
2002-11-05 20:20:50 +00:00
9bddc20bd3 changed:
friend SG_Controller;
to:
 friend class SG_Controller;

gcc-3.2 was complaining that it wasn't defined.

Kent
--
mein@cs.umn.edu
2002-11-05 19:54:23 +00:00
bd39a84c8b Added fmod sound for OSX and fixed some endian problems in
gameengine/SoundSystem to get it to work.
Maarten (mail@maartengribnau.com)
2002-11-04 21:50:33 +00:00
c458cc7310 Forgot to remove sumo physics controllers
Maarten (mail@maartengribnau.com)
2002-11-04 21:47:37 +00:00
0698cafb6a removed last traces of sumo for Makefile users
1. Removed KX_SumoPhysicsController.h and KX_SumoPhysicsController.cpp
2. Changed some Makefiles to skip sumo
Maarten (mail@maartengribnau.com)
2002-11-04 20:22:33 +00:00
18db5b8676 Added specific external libary locations for OSX/darwin that override the
defaults in the lib tree (see instructions in ../readme.txt).
Maarten (mail@maartengribnau.com)
2002-11-03 22:43:28 +00:00
08b13d90f5 added a line to add executable attributes to the binaries when copying into the
Mac bundles
Maarten (mail@maartengribnau.com)
2002-11-03 22:38:32 +00:00
8ddd50ef5c added a line to add executable attributes to the binaries when copying into the
Mac bundles
Maarten (mail@maartengribnau.com)
2002-11-03 22:29:15 +00:00
c9f6b9c268 removed sumo from build directories
Maarten (mail@maartengribnau.com)
2002-11-03 21:30:02 +00:00
703661876e I made a little readme to get people started and modified the
nan_definitions.mk to setup NANBLENDERHOME and everything is under that
directory.
also add empty dirs for lib and obj.
Try it out and feel free to make improvements.

mein@cs.umn.edu
2002-10-31 19:32:01 +00:00
0bca792880 again changing // to /* */ so that sun's compiler doesn't fail.
(note these are all in source/blender/verify)
Sorry about not putting the full path in on the last two,
I just noticed it doesn't do that unless your in the root dir.

mein@cs.umn.edu
2002-10-30 21:51:56 +00:00
59e07ab2a5 Fixed // comments and converted them to /* */ (used by a c file) 2002-10-30 21:40:36 +00:00