griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
272 Commits 1 Branch 0 Tags
0df2cdbc2dfe2b257ba8e0322e71d49be71ee11a
Commit Graph

119 Commits

Author SHA1 Message Date
Wouter van Heyst
3bf8d2aa0c Get the Blender module back using the traditional makefiles, other 
build systems (auto, msvc, PB) do not seem to have this problem.

- Change intern/python/freeze/Makefile to freeze outside of the source/ tree
- Change source/blender/bpython/Makefile to not build the frozen stuff anymore
- Change source/blender/bpython/intern/Makefile to use CURRENT_PYTHON_API
   instead of FUTURE_PYTHON_API, damage control
 2003-01-26 02:42:22 +00:00
Wouter van Heyst
23fe9bb3fe Use saner defaults on Linux 2003-01-24 16:53:47 +00:00
Stefan Gartner
3c9e4d3227 make switching to bottom, back, and left view (shift+pad7, shift+pad1 
and shift+pad1) work when in camera view
 2003-01-24 07:18:30 +00:00
Chris Want
f5c1bdac33 Changed NAN_PYTHON_VERSION from 2.0 to 2.2 for the 
windows build.
 2003-01-24 01:57:24 +00:00
Rob Haarsma
5d93519fbc added showlinenrs variable to spacetext 2003-01-23 16:39:17 +00:00
Rob Haarsma
219e8e3846 added headerbutton for drawing of linenumbers 2003-01-23 16:38:12 +00:00
Rob Haarsma
5ff1376b37 added drawing of linenumbers in the texteditor 2003-01-23 16:37:40 +00:00
Rob Haarsma
e792bdb72a added buttondefine to show linenumbers 2003-01-23 16:36:47 +00:00
Kent Mein
4fe03a8923 Looks like the two definitions were inside constructors duh.... 
So I'm reverting.

Kent
 2003-01-22 03:09:30 +00:00
Kent Mein
b018475935 Removed two local vars that were set and then never used. 
(for example heres one:   bool isActor = objprop->m_isactor;)

Kent
 2003-01-21 18:30:44 +00:00
Kent Mein
e4ef29295c changed: 
#else !_APPLE
to:
#else /* !_APPLE */

Kent
 2003-01-19 14:13:50 +00:00
Kent Mein
6597ac3657 I updated the sumo includes paths to point to the right places... 
Probably can just remove the lines from these files but ohh well :)

Kent
 2003-01-19 09:04:23 +00:00
Kent Mein
9891e69065 I modified the header so that it didn't warn about comment inside of a comment. 
Changed
/* id blah
/* text
 */

to
/*
 * id blah
 * text
 */

Kent
 2003-01-19 08:45:49 +00:00
Kent Mein
227a8b7d16 I took out adding ode to the directorys to build in blender/source/Makefile 
since its no longer there.  Here is the diff.

Kent

Index: Makefile
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile    11 Jan 2003 22:47:48 -0000      1.24
+++ Makefile    14 Jan 2003 19:06:59 -0000
@@ -39,9 +39,6 @@
 include nan_definitions.mk

 DIRS = creator blender kernel gameengine
-ifneq ($(OS),$(findstring $(OS), "darwin freebsd irix linux"))
-    DIRS += ode
-endif
 2003-01-14 19:08:56 +00:00
Francis Laurence
22b42656aa Remove BDR_isect.h 
The purpose of this and the previous commit is to remove the old mesh
intersection function (activated by the "Intersect" button in the mesh buts)
 2003-01-13 19:20:34 +00:00
Francis Laurence
fd2a468d5d Get rid of call to isect - the old (but loved)interection function. 2003-01-13 19:07:01 +00:00
Hans Lambermont
bb4ea174f1 kill unneccesary python ramblings on Solaris 2003-01-12 06:12:25 +00:00
Hans Lambermont
a1a8edffeb don't try to link against ODE on Irix 2003-01-11 22:47:48 +00:00
Hans Lambermont
1a32da86f1 skip BlOde for irix 2003-01-11 22:10:00 +00:00
Wouter van Heyst
5e6c729aa7 Revert NAN_OPENSSL to it's previous value of '/usr' on FreeBSD 2003-01-11 02:37:11 +00:00
Kent Mein
fc0e924e0f I went whole hog on the definitions each platform has its own block 
and there is a block at the very end for platforms not specified above.

(not all of the defintions are in the platform's for example there
is no need for  export NAN_IKSOLVER ?= $(LCGDIR)/iksolver
to be repeated all over the place, all of the ones you'll probably
want to change are in the platform specific blocks though)

This allows all platforms to be overridden by env vars...

Kent
 2003-01-10 22:45:25 +00:00
Kent Mein
3dbf2235e4 modified the default path to python for macosX to /sw 
which is where fink puts it.

Kent
 2003-01-10 16:15:49 +00:00
Wouter van Heyst
ade767d2af Linux now also uses ode from lib/ 2003-01-07 05:08:10 +00:00
Stefan Gartner
3531f874e0 added a buch of 
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
(also for <GL/glu.h>)

so that people don't have to create symlinks in
/System/Library/Frameworks/OpenGL.framework on Mac OS X
(Charles Wardlaw)
 2003-01-07 00:18:59 +00:00
Hans Lambermont
3a0c7e4a8a John Walton's changes for Irix mips3 (NaN makefiles build) 2003-01-06 23:01:28 +00:00
Frank van Beek
e8b0922986 - DEFFILE needed for linking Netscape Blender plugin now points to local 
version of npB3DPlg.def
 2003-01-05 17:58:46 +00:00
Hans Lambermont
42dcaf9add cleanup. 2003-01-05 14:28:33 +00:00
Hans Lambermont
95c780f203 remove ssr leftovers 2003-01-05 14:27:57 +00:00
Hans Lambermont
080dd299d6 - use ODE in lib/ for FreeBSD 
- use default python library path
- remove obsolete SSR comments
 2003-01-04 20:20:54 +00:00
Frank van Beek
3aa1f9ed3e - replaced files with the original versions that also contain 32x32 and 
8 bit icons.
 2003-01-04 17:18:50 +00:00
Frank van Beek
24f546162e - we're using python22.lib instead of python20.lib nowadays 2003-01-04 16:29:09 +00:00
Hans Lambermont
302399b9d0 and the other FreeBSD python locations. 2003-01-04 01:41:19 +00:00
Hans Lambermont
4a42823155 another FreeBSD python location change 2003-01-04 00:40:47 +00:00
Hans Lambermont
7ff3f0553f start using platform default locations for FreeBSD. 
try not to break anything for other platforms.
 2003-01-04 00:35:01 +00:00
Hans Lambermont
b506bdb2b7 Use FreeBSD's default python location when on FreeBSD 2003-01-04 00:19:53 +00:00
Hans Lambermont
5fda04dfdc 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
 2003-01-03 22:51:49 +00:00
Michel Selten
0a51feab36 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
 2003-01-03 21:36:16 +00:00
Kent Mein
6e8abc4a8e Rob's patches for the slow render problem. 
Kent
--
mein@cs.umn.edu
 2003-01-01 17:47:20 +00:00
Kent Mein
e67802264a changed back to char :) 
Kent
--
mein@cs.umn.edu
 2002-12-31 14:43:16 +00:00
Kent Mein
69c57046e7 Sorry about that this is part of the last update. I ment to cancel it 
and include both files.

Anyway I was fixing the warning with ascii char...  Here is the diff for
editfont.c (the .h was just fixing the header to match it)

Kent

Index: editfont.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/editfont.c,v
retrieving revision 1.3
diff -u -r1.3 editfont.c
--- editfont.c  25 Nov 2002 12:02:05 -0000      1.3
+++ editfont.c  31 Dec 2002 11:52:10 -0000
@@ -226,11 +226,12 @@
        }
 }

-void do_textedit(unsigned short event, short val, char ascii)
+void do_textedit(unsigned short event, short val, unsigned char _ascii)
 {
        Curve *cu;
        static int accentcode= 0;
        int x, doit=0, cursmove=0;
+        int ascii = _ascii;
 2002-12-31 11:54:33 +00:00
Kent Mein
b36298c60e :q! 2002-12-31 11:53:03 +00:00
Kent Mein
85ddbc4514 Updated the spacebar toolbox so the fonts are moved up 2 pixels. 
It was causing funky artifacts on some letters that dropped down into the
background.

Here is the diff

Kent


Index: toolbox.c
===================================================================
RCS file: /cvs01/blender/source/blender/src/toolbox.c,v
retrieving revision 1.5
diff -u -r1.5 toolbox.c
--- toolbox.c   22 Dec 2002 13:43:21 -0000      1.5
+++ toolbox.c   30 Dec 2002 20:13:51 -0000
@@ -506,7 +506,7 @@
        oldcursor= get_cursor();
        set_cursor(CURSOR_STD);

-       tbfontyofs= (TBOXH-11)/2;       /* toolbox, hier stond ooit getheigh */
+       tbfontyofs= (TBOXH-11)/2 +2;    /* toolbox, hier stond ooit getheigh */
 }
 2002-12-30 20:15:07 +00:00
Kent Mein
5e6d6710c4 renamed a var to avoid name conflicts... 
In the header its just this..
-void initjit(float *jit, int num)
+void initjit(float *jitarr, int num)

its respectively renamed in jitter.c

Kent
 2002-12-30 07:15:47 +00:00
Kent Mein
e9a7e30758 Removed another unused var and cleaned up a couple of lines of code 
Here is the diff

Kent

Index: GameLogic/SCA_KeyboardSensor.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp,v
retrieving revision 1.3
diff -u -r1.3 SCA_KeyboardSensor.cpp
--- GameLogic/SCA_KeyboardSensor.cpp    25 Nov 2002 15:29:42 -0000      1.3
+++ GameLogic/SCA_KeyboardSensor.cpp    30 Dec 2002 07:09:42 -0000
@@ -167,14 +167,14 @@
        } else
        {

-         //            cerr << "======= SCA_KeyboardSensor::Evaluate:: peeking at key status" << endl;
-               const SCA_InputEvent & inevent = inputdev->GetEventValue((SCA_IInputDevice::KX_EnumInputs) m_hotkey);
+       //              cerr << "======= SCA_KeyboardSensor::Evaluate:: peeking at key status" << endl;
+               const SCA_InputEvent & inevent = inputdev->GetEventValue(
+                       (SCA_IInputDevice::KX_EnumInputs) m_hotkey);

-               //              cerr << "======= SCA_KeyboardSensor::Evaluate::
status: " << inevent.m_status << endl;
+       //              cerr << "======= SCA_KeyboardSensor::Evaluate:: status: " << inevent.m_status << endl;

                if (inevent.m_status == SCA_InputEvent::KX_NO_INPUTSTATUS)
                {
-                       int i=4;
                } else
                {
                        if (inevent.m_status == SCA_InputEvent::KX_JUSTACTIVATED)
 2002-12-30 07:13:26 +00:00
Kent Mein
cc95cdd390 Removed unused var here is the diff: 
Kent


Index: gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp,v
retrieving revision 1.3
diff -u -r1.3 KX_PyConstraintBinding.cpp
--- gameengine/Ketsji/KX_PyConstraintBinding.cpp        25 Nov 2002 15:29:49 -0000      1.3
+++ gameengine/Ketsji/KX_PyConstraintBinding.cpp        30 Dec 2002 07:08:18 -0000
@@ -128,7 +128,6 @@
 {
        int constraintid;

-       int len = PyTuple_Size(args);
        if (PyArg_ParseTuple(args,"i",&constraintid))
        {
                if (g_physics_env)
 2002-12-30 07:09:23 +00:00
Stefan Gartner
707dfe1c38 added two accidentally deleted #'s (without them makesdna wouldn't work 
properly)

sgefant
 2002-12-27 21:14:32 +00:00
Kent Mein
f1c4f705a1 Removed the config.h thing from the .h's in the source dir. 
So we should be all set now :)

Kent
--
mein@cs.umn.edu
 2002-12-27 13:11:01 +00:00
Maarten Gribnau
1737a73a4a Disabled player's check for Publisher file for input. 
Maarten
 2002-12-22 22:02:57 +00:00
Maarten Gribnau
2417e61e16 Fixed binary files stored as text files for plug-ins 
Maarten
 2002-12-22 22:00:55 +00:00
Simon Clitherow
a79780b1a4 fixed a *really* minor bug where tooltips were not resetting if next 
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, "");
>
 2002-12-22 13:43:21 +00:00