1
1

13370 Commits

Author SHA1 Message Date
360f831339 Apricot Branch
==============

Various changes from trunk that were somehow missed with merges, and
small code cleanups and fixes.
2008-09-04 15:45:25 +00:00
7e8a3aa0b1 svn merge -r 16334:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-04 00:32:15 +00:00
0d5ec24a05 Apricot Branch:
* Fix for wrong bone parent transform with duplis (multiplayer).
* Fix for crash on export when the bone in a bone parent relation
  does not exist anymore.
2008-09-04 00:16:34 +00:00
36d3ae12c6 svn merge -r 16328:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-02 06:36:19 +00:00
546127d964 svn merge -r 16297:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-01 07:03:09 +00:00
bb57536018 Apricot Branch: bugfix, setting manual glsl shaders did not release
displaylists, resulted in missing texture coordinates sometimes.
2008-08-29 14:13:26 +00:00
12200c39df Apricot Branch: better support for multiple scenes with glsl,
now it keeps shaders and lamps per scene.
2008-08-29 13:23:33 +00:00
87b7ba70a1 svn merge -r 16295:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-29 06:36:11 +00:00
4d368cb298 svn merge -r 16293:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-29 03:18:02 +00:00
7e4eb371fe svn merge -r 16287:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender still getting errors compiling blenderplayer 2008-08-28 23:12:29 +00:00
2b1c7fe4f9 Apricot Branch: didn't add these file in the last merge commit. 2008-08-28 11:26:40 +00:00
ce70b6bf3b Apricot Branch:
svn merge -r 16266:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-28 11:22:06 +00:00
1aa359ab7b Apricot Branch: bugfix for crash in shadow buffer rendering
combined with the shadow option for texfaces.
2008-08-27 19:12:08 +00:00
3a5b40d8f5 Apricot Branch: another fix for obcolor alpha - i can't seem
to get this right :).
2008-08-27 14:18:52 +00:00
7c9e742dce Apricot Branch: bugfix, broke bone parenting with yesterday's commit. 2008-08-27 13:10:16 +00:00
b5f48d78b4 Apricot Branch: still didn't get the glsl obcolor mixing right,
forgot why I did it the other way around before (because of alpha),
should work correct now.

Also, noticed I committed a bugfix before without knowing related
to creating material buckets with > 65k faces. The fix was provided
by Samuel Anjam, thanks!
2008-08-27 11:56:11 +00:00
b4680f5ca1 divide by zero for texture animation when start and end frames are the same 2008-08-27 07:12:07 +00:00
3b8ed715b6 svn merge -r 16246:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-27 03:41:29 +00:00
76f35a1e9a Apricot Branch: apply glsl object color before mist, makes more sense. 2008-08-26 17:53:04 +00:00
76d03839ac Apricot Branch: fix for a change I made to avoid doing where_is_pose
too often, didn't work correct for multiple objects sharing the same
armature.
2008-08-26 17:38:39 +00:00
4988a1b7f9 Apricot Branch: bugfix, crash in lights switching blender files,
accidentally removed a line of code that should have been kept.
2008-08-26 12:38:05 +00:00
01ba073f46 svn merge -r 16239:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-25 10:11:43 +00:00
b766ff4a00 svn merge -r 16227:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Thanks for bens state level commit will be able to clean up duplicate sensors a bit :)
http://members.optusnet.com.au/cjbarton/frank_logic.png
2008-08-24 02:46:03 +00:00
468b25e0f5 Apricot Branch: svn merge -r 16194:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-22 11:51:56 +00:00
8eedcfcc3f error in last commit 2008-08-22 02:33:19 +00:00
93fc6cb680 missing NULL check when game text meshes had no vertex colors 2008-08-22 00:54:22 +00:00
2d428a4061 partial merge because of conflicts
svn merge -16186:16194 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-21 23:41:08 +00:00
2febacefe2 Apricot Branch: bugfix: glsl materials didn't get correct lights
when switching between blend files. Also took advantage of this
to remove some duplicate code related to accessing blender scenes.
2008-08-21 15:44:29 +00:00
c98ae55666 Apricot Branch: fix for bug #17435, only first 3 texture slots were
being used for finding second uv coordinate layer.
2008-08-21 13:40:40 +00:00
c594a6f25c Apricot Branch
==============

* Make lights and shadows work better with dupligroups, also in
  the game engine. Previously only one dupli would be created,
  and shadows didn't work well at all.
* Make normal maps + stencil work.
* Some glsl refresh and default material fixes.
2008-08-20 16:29:55 +00:00
2a9a2825f5 Apricot Branch: two bugfixes for issues with game engine draw
state switching textures and object color, showed as flickering.
2008-08-19 17:08:20 +00:00
10af2a3cd5 svn merge -r16186:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-19 12:19:38 +00:00
75570d9410 svn merge -r16170:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-19 04:00:22 +00:00
f98d21ca84 Apricot Branch
==============

* Added support for the realtime image "Anim" option for GLSL textures.
  Note that "Tiles" is not supported, i.e. it doesn't scale the texture
  for you, but that may even be desirable.
* Further there was some refactoring to remove duplicated and unused
  opengl texture code for GLSL.
2008-08-18 18:16:32 +00:00
9873352b02 Apricot Branch: fix some missing updates for GLSL materials
when changing world settings. Thanks Pablo for the patch,
though I implemented it a bit differently.
2008-08-18 13:25:27 +00:00
d535770c18 small error, stopped apricot building on linux-32bit 2008-08-18 13:06:33 +00:00
e174b34eef Apricot Branch
==============

svn merge -r16142:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-18 12:09:33 +00:00
9ffc3d065d Apricot Branch: bugfix, some meshes were not deforming anymore
after a recent commit.
2008-08-18 10:27:48 +00:00
009f826006 svn merge -r16106:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-17 01:24:40 +00:00
46131fbcd4 Apricot branch: a fix for flickering alpha, with multi-material
objects. Note that sorting is only between polygons with the same
material, so which material draws first is still arbitrary, but
consistent.
2008-08-14 17:12:40 +00:00
9cc4173c60 svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-14 09:18:57 +00:00
15fd22c6bd Apricot Branch
==============

svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-13 17:42:58 +00:00
b5fcdc4074 Apricot Branch
==============

Various cleanups and optimizations in the game engine:
* Remove some duplication in the RAS_RenderTools, and sync the blender
  and game player versions. Also avoid some opengl state changes.
* Don't make separate materials for triangles and quads, this distinction
  was moved to the mesh level. Also don't take some other irrelevant tface
  settings into account to avoid making more materials.
* Refactoring of mesh storage, should fix wrong normals on meshes that are
  reused. It also allows for joining together nearby meshes for speed, though
  that's disabled still because it doesn't work together correct yet with 
  ome features.
* Added a distinction for game objects to be either culled or set invisible,
  previously there was only one flag, which couldn't work correct.
* For parenting to bones, where_is_pose was executed multiple times per
  frame, now should be once per armature.
* Fix uninitialized intertia value in the physics system.
* Various warning fixes.
* Removed some conditionals in GLSL and other minor optimizations in the
  code. Also cache opengl uniform locations, and fix an invalid memory read.
* Avoid doing some math for GLSL lamps if it is not required.
2008-08-13 17:37:37 +00:00
17c81efced svn merge -r16009:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-12 12:57:18 +00:00
4043226064 svn merge -r15983:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-07 20:00:58 +00:00
81602d9b85 svn merge -r15968:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-06 00:37:27 +00:00
cd6cec0ebb svn merge -r15932:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-05 10:39:13 +00:00
56d3bfc28a apricot branch: fix a bug with the export of the second uv layer
to the game engine for GLSL.
2008-08-03 16:02:56 +00:00
0253b73fcb apricot branch: svn merge -r15868:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-03 14:46:34 +00:00
b818016d77 Apricot Branch
==============

svn merge -r15866:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

Alpha blending and sorting changes, but also include some initial
support for GLSL lamps in dupligroups (only one duplicate works at
the moment).
2008-07-29 16:25:20 +00:00