| Age | Commit message (Collapse) | Author |
|---|
|
Maarten
|
|
Maarten
|
|
call to add_numbut() asks for a NULL tooltip. --aphex
============================================================
RCS file: /cvs01/blender/source/blender/src/toolbox.c,v
retrieving revision 1.4
diff -r1.4 toolbox.c
1356c1356,1360
< if(tip) strcpy(numbuts[nr].tip, tip);
---
> if(tip)
> strcpy(numbuts[nr].tip, tip);
> else
> strcpy(numbuts[nr].tip, "");
>
|
|
in /usr/local.
mxTextTools is still disabled because of a link error.
Maarten
|
|
else if(dev==DELKEY) {
if(but->pos>=0 && but->pos<strlen(str)) {
for(x=but->pos; x<=strlen(str); x++)
str[x]= str[x+1];
str[--len]='\0';
dodraw= 1;
}
}
Kent
|
|
Submitted to bf-committers by Chris Want
Kent
Index: targa.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/targa.c,v
retrieving revision 1.4
diff -u -r1.4 targa.c
--- targa.c 2002/12/20 01:29:14 1.4
+++ targa.c 2002/12/21 09:50:24
@@ -289,6 +289,12 @@
if (flags & IB_ttob) buf[17] ^= 0x20;
+ /* Don't forget to indicate that your 32 bit
+ * targa uses 8 bits for the alpha channel! */
+ if (ibuf->depth==32) {
+ buf[17] |= 0x08;
+ }
+
if (write(file, buf, 18) != 18) return (0);
if (ibuf->cmap){
for (i = 0 ; i<ibuf->maxcol ; i++){
|
|
same thing:
Added the xpcom include and added a flag to use mozilla vs netscape.
Which basically adds some ifdefs to
_Blender3DPlugin_implementation_.cpp
Basically I modified the nan_definitions.mk in the following way
(You'll need to update yours don't forget) ;)
Also updated the makefiles to use the new vars and flushed them out
so they first include whatever nspr is set to and then look in
NAN_MOZILLA_INC
I wasn't sure what the NAN_MOZILLA_INC and _LIB defaults should be
since were assuming they point to a netscape dir by default (or maybe
old mozilla???)
maybe they should be
export NAN_MOZILLA_INC ?= $(LCGDIR)/netscape/include
export NAN_MOZILLA_LIB ?= $(LCGDIR)/netscape/lib/
instead...
Anyone have any opinions on the defaults?
Kent
--
mein@cs.umn.edu
Index: nan_definitions.mk
===================================================================
RCS file: /cvs01/blender/source/nan_definitions.mk,v
retrieving revision 1.8
diff -u -r1.8 nan_definitions.mk
--- nan_definitions.mk 2002/12/19 21:12:58 1.8
+++ nan_definitions.mk 2002/12/20 19:28:51
@@ -75,7 +75,13 @@
export NAN_TEST_VERBOSITY ?= 1
export NAN_ZLIB ?= $(LCGDIR)/zlib
export NAN_BMFONT ?= $(LCGDIR)/bmfont
- export NAN_MOZILLA ?= $(LCGDIR)/mozilla
+ # Uncomment the following line to use Mozilla inplace of netscape
+ # CPPFLAGS +=-DMOZ_NOT_NET
+ # Location of MOZILLA/Netscape header files...
+ export NAN_MOZILLA_INC ?= $(LCGDIR)/mozilla/include
+ export NAN_MOZILLA_LIB ?= $(LCGDIR)/mozilla/lib/
+ # Will fall back to look in NAN_MOZILLA_INC/nspr and NAN_MOZILLA_LIB
+ # if this is not set.
export NAN_NSPR ?= $(LCGDIR)/nspr
|
|
comment inside of a comment
Also removed the config.h thing since this is a .h
Hopefully I'll get around to the other .h's soon.
Kent
--
mein@cs.umn.edu
|
|
Time to go watch er.
Note this was already done with face_old, img_old was probably just
overlooked.
(If you guys didn't notice I was sick for a couple of days but I'm back now
as you can tell)
Kent
--
mein@cs.umn.edu
Index: editface.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editface.c,v
retrieving revision 1.3
diff -u -r1.3 editface.c
--- editface.c 2002/11/25 12:02:05 1.3
+++ editface.c 2002/12/20 02:50:55
@@ -1202,7 +1202,7 @@
TFace *face, *face_old = 0;
short xy[2], xy_old[2];
//int a, index;
- Image *img, *img_old;
+ Image *img, *img_old = 0;
|
|
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:
|
|
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;
|
|
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
|
|
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;
|
|
with Blender. The line is commented by default as was discussed on the list.
Maarten
|
|
This may not be correct but at least now its predictable.
Kent
|
|
Maarten
|
|
Maarten
|
|
This is now replaced by the Ode lib in CVS.
Maarten
|
|
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
|
|
to the stubs to get the player linking with Project Builder under OSX.
Maarten
|
|
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
|
|
sgefant
|
|
(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
|
|
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
|
|
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
|
|
or at least tried.
You will probably want to rm -rf source/darwin/blenderpublisher.app
Kent
--
mein@cs.umn.edu
|
|
(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
|
|
complaints about redefinitions. These occur now that Python 2.2 is included.
|
|
thingy in the upper right corner.
-Fred <phaethon>
|
|
Maarten
|
|
Kent
--
mein@cs.umn.edu
|
|
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
|
|
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
added to these files.
Kent
--
mein@cs.umn.edu
|
|
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Just need to finish cpp files now :)
Kent
--
mein@cs.umn.edu
|
|
(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
|
|
+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
|
|
Kent
--
mein@cs.umn.edu
|
|
Kent
--
mein@cs.umn.edu
|
|
It worked on my system and no one else has said anything.
Kent
--
mein@cs.umn.edu
|
|
Maarten
|
|
|
|
Maarten
|
|
Kent
--
mein@cs.umn.edu
|
|
that way the lib gets installed before the dir didn't exist so it
died.
Kent
--
mein@cs.umn.edu
|
|
missed it before.
Kent
--
mein@cs.umn.edu
|
|
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
|
|
-CPPFLAGS += -I../../../../sumo/Fuzzics/include
-CPPFLAGS += -I../../../../sumo/include
+CPPFLAGS += -I$(NAN_FUZZICS)/include
+CPPFLAGS += -I$(NAN_SUMO)/include
Kent
--
mein@cs.umn.edu
|
|
changes.
Instead modified the top level nan_definitions.mk to point the NAN_SUMO and
NAN_FUZZICS to the right locations.
Maarten
|
|
friend SG_Controller;
to:
friend class SG_Controller;
gcc-3.2 was complaining that it wasn't defined.
Kent
--
mein@cs.umn.edu
|
|
gameengine/SoundSystem to get it to work.
Maarten (mail@maartengribnau.com)
|
