Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-09-04Apricot BranchapricotBrecht Van Lommel
============== Various changes from trunk that were somehow missed with merges, and small code cleanups and fixes.
2008-09-04svn merge -r 16334:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-09-04Apricot Branch:Brecht Van Lommel
* 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-02svn merge -r 16328:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-09-01svn merge -r 16297:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-29Apricot Branch: bugfix, setting manual glsl shaders did not releaseBrecht Van Lommel
displaylists, resulted in missing texture coordinates sometimes.
2008-08-29Apricot Branch: better support for multiple scenes with glsl,Brecht Van Lommel
now it keeps shaders and lamps per scene.
2008-08-29svn merge -r 16295:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-29svn merge -r 16293:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-29svn merge -r 16287:HEAD ↵Campbell Barton
https://svn.blender.org/svnroot/bf-blender/trunk/blender still getting errors compiling blenderplayer
2008-08-28Apricot Branch: didn't add these file in the last merge commit.Brecht Van Lommel
2008-08-28Apricot Branch:Brecht Van Lommel
svn merge -r 16266:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-27Apricot Branch: bugfix for crash in shadow buffer renderingBrecht Van Lommel
combined with the shadow option for texfaces.
2008-08-27Apricot Branch: another fix for obcolor alpha - i can't seemBrecht Van Lommel
to get this right :).
2008-08-27Apricot Branch: bugfix, broke bone parenting with yesterday's commit.Brecht Van Lommel
2008-08-27Apricot Branch: still didn't get the glsl obcolor mixing right,Brecht Van Lommel
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-27divide by zero for texture animation when start and end frames are the sameCampbell Barton
2008-08-27svn merge -r 16246:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-26Apricot Branch: apply glsl object color before mist, makes more sense.Brecht Van Lommel
2008-08-26Apricot Branch: fix for a change I made to avoid doing where_is_poseBrecht Van Lommel
too often, didn't work correct for multiple objects sharing the same armature.
2008-08-26Apricot Branch: bugfix, crash in lights switching blender files,Brecht Van Lommel
accidentally removed a line of code that should have been kept.
2008-08-25svn merge -r 16239:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-24svn merge -r 16227:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
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-22Apricot Branch: svn merge -r 16194:HEAD ↵Brecht Van Lommel
https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-22error in last commitCampbell Barton
2008-08-22missing NULL check when game text meshes had no vertex colorsCampbell Barton
2008-08-22partial merge because of conflicts Campbell Barton
svn merge -16186:16194 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-21Apricot Branch: bugfix: glsl materials didn't get correct lightsBrecht Van Lommel
when switching between blend files. Also took advantage of this to remove some duplicate code related to accessing blender scenes.
2008-08-21Apricot Branch: fix for bug #17435, only first 3 texture slots wereBrecht Van Lommel
being used for finding second uv coordinate layer.
2008-08-20Apricot BranchBrecht Van Lommel
============== * 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-19Apricot Branch: two bugfixes for issues with game engine drawBrecht Van Lommel
state switching textures and object color, showed as flickering.
2008-08-19svn merge -r16186:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-19svn merge -r16170:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-18Apricot BranchBrecht Van Lommel
============== * 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-18Apricot Branch: fix some missing updates for GLSL materialsBrecht Van Lommel
when changing world settings. Thanks Pablo for the patch, though I implemented it a bit differently.
2008-08-18small error, stopped apricot building on linux-32bitCampbell Barton
2008-08-18Apricot BranchBrecht Van Lommel
============== svn merge -r16142:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-18Apricot Branch: bugfix, some meshes were not deforming anymoreBrecht Van Lommel
after a recent commit.
2008-08-17svn merge -r16106:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-14Apricot branch: a fix for flickering alpha, with multi-materialBrecht Van Lommel
objects. Note that sorting is only between polygons with the same material, so which material draws first is still arbitrary, but consistent.
2008-08-14svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-13Apricot BranchBrecht Van Lommel
============== svn merge -r16064:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-08-13Apricot BranchBrecht Van Lommel
============== 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-12svn merge -r16009:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-08svn merge -r15983:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-06svn merge -r15968:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-05svn merge -r15932:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blenderCampbell Barton
2008-08-03apricot branch: fix a bug with the export of the second uv layerBrecht Van Lommel
to the game engine for GLSL.
2008-08-03apricot branch: svn merge -r15868:HEAD ↵Brecht Van Lommel
https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-07-29Apricot BranchBrecht Van Lommel
============== 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).