Commit Graph

67088 Commits

Author SHA1 Message Date
Kent Mein
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
Kent Mein
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
Kent Mein
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
Kent Mein
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
Maarten Gribnau
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
Kent Mein
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
Maarten Gribnau
ac699ba672 Used NAN_ODE to point to the ode lib location.
Maarten
2002-12-19 21:14:18 +00:00
Maarten Gribnau
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
Kent Mein
45c360dfc4 -static void SleepTillEvent(Display *display, GHOST_TUns64 maxSleep) {
+static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) {

maxSleep is checked against -1 so it needs to have a sign.
This could even fix some stability problems since -1 is passed in sometimes
in the code.

Kent
--
mein@cs.umn.edu
2002-12-19 20:08:12 +00:00
Kent Mein
d9df4b8feb Fixed this warning:
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment(MT_Point3,
   MT_Matrix3x3, double, MT_ExpMap)':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
   IK_QSegment::m_length'
IK_QSegment.h:270: warning:   and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:56: warning:   will be re-ordered to match declaration order
IK_QSegment.h: In constructor `IK_QSegment::IK_QSegment()':
IK_QSegment.h:271: warning: member initializers for `MT_Scalar
   IK_QSegment::m_length'
IK_QSegment.h:270: warning:   and `MT_ExpMap IK_QSegment::m_q'
IK_QSegment.cpp:73: warning:   will be re-ordered to match declaration order

Kind of goofy its just the order of which 2 private vars are defined.

Kent
--
mein@cs.umn.edu
2002-12-19 20:06:07 +00:00
Maarten Gribnau
00ef6591d2 Updated the readme section on building OSX.
Not sure whether this should also go in the xml file in the doc directory.
If so, what editor should I use?
Maarten
2002-12-16 22:43:27 +00:00
Maarten Gribnau
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
Kent Mein
8b9b761e97 Created a Makefile and got it actually to compile :)
Kent
--
mein@cs.umn.edu
2002-12-16 12:02:24 +00:00
Kent Mein
cca22768dc Added extra libs for solaris
(-l/usr/openwin/lib -lglut etc...)

Kent
--
mein@cs.umn.edu
2002-12-16 11:18:31 +00:00
Kent Mein
a5b42eb626 Fixed the files so they compile...
Had to add an argument to Create_window... (it was missing the sterio flag)

Also cleaned up some variable overloading warnings...
(i.e. window shadows previous def)

Kent
2002-12-16 10:57:08 +00:00
Kent Mein
4a9377a861 Gilles's patch to get rid of the the same identifier warnings
Kent
--
mein@cs.umn.edu
2002-12-14 15:38:45 +00:00
Simon Clitherow
cfceb16f4a Corrected intern lib names so blendercreator.dsp can find them.
Previous commit broke this. --aphex
2002-12-14 12:31:17 +00:00
Maarten Gribnau
e5f7a4f58b OSX Project Builder project for makes_dna, blender and player targets.
After building intern with the Makefile, this project builds all three targets.
blender and player targets are dependent on makes_dna so that dna.c is generated
automatically (at the moment it is created evry build).
The applications are complete with icons and file type registering.
The only catch is that it might be necessary to symlink the darwin-6.1-powerpc
directory if your kernel is no on 6.1.

Maarten
2002-12-13 21:34:52 +00:00
Kent Mein
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
Maarten Gribnau
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
Simon Clitherow
0c1e935175 And the rest! ;) --aphex 2002-12-12 21:16:46 +00:00
Simon Clitherow
12a587bd58 Modified the intern MSVC project files to make them more
Win9x/ME-friendly.

This shouldn't break the NT/2000/XP builds, but let me know if it does!

--aphex
2002-12-12 21:13:47 +00:00
Simon Clitherow
77a7a8074e Updated the debug target defines. --aphex 2002-12-12 18:42:00 +00:00
Stefan Gartner
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
Kent Mein
662b586185 Commited Simon Clitherow's mods to BL_src.dsp
Kent
--
mein@cs.umn.edu
2002-12-10 04:38:49 +00:00
Stefan Gartner
2494b7c9cc don't crash when adding a UVsphere (Hos, heli)
sgefant
2002-12-07 20:57:50 +00:00
Kent Mein
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
Kent Mein
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
Kent Mein
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
Kent Mein
671a355e9f Got rid of unused files in intern/iksolver
(removed them from cvs and from the Makefile.am)

Kent
--
mein@cs.umn.edu
2002-12-03 12:11:07 +00:00
Kent Mein
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
Kent Mein
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
Kent Mein
644e4d7c1c I added
#include <stdlib.h>
To fix a problem with a machine not being able to find malloc

Kent
2002-12-02 09:48:10 +00:00
Maarten Gribnau
a670f47461 Added img lib to the include path of the MSVC project file.
Maarten
2002-12-01 23:03:08 +00:00
Maarten Gribnau
790c5cc8c1 Updated MSVC project file with the new frozen files.
Maarten
2002-12-01 23:00:21 +00:00
Maarten Gribnau
3ee75a90d2 These freeze changes give working frozen Python code on Windows.
Maarten
2002-12-01 22:58:29 +00:00
Maarten Gribnau
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
Maarten Gribnau
d48f993c55 Removed non-existing Tools from the Blender module.
This allowed me to get Python working in Blender.
Maarten
2002-12-01 21:24:45 +00:00
Frederick Lee
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
Michel Selten
86ac000694 Reverting to version 1.3 - michel 2002-11-30 15:34:57 +00:00
Michel Selten
0f4b24cc3c added -f option to the rm command. (Clean target) - michel 2002-11-30 15:00:47 +00:00
Frederick Lee
61ab941edb Autotools-specific freeze_ac.py and makemakefile_ac.py. Original makemakefile.py reverted for sake of original build system. Makefile.am modified accordingly. 2002-11-30 05:43:14 +00:00
Maarten Gribnau
07049dda83 Somehow the img directory got lost from the list of include paths
Maarten
2002-11-29 20:51:40 +00:00
Kent Mein
651fa32eaa Bunch of small fixes emailed to me from phaethon
Kent
--
mein@cs.umn.edu
2002-11-29 17:07:58 +00:00
Kent Mein
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
Kent Mein
56743efbcd Fixed some stuipid bugs in the Makefile.am's and
added --with-ode=prefix to configure.ac

Getting closer to building...

Kent
--
mein@cs.umn.edu
2002-11-27 16:25:54 +00:00
Kent Mein
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
Kent Mein
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
Kent Mein
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
Kent Mein
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