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
2011-11-07Cycles: svn merge -r41531:41613 ^/trunk/blenderBrecht Van Lommel
2011-11-06more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.Campbell Barton
2011-11-05Cycles: svn merge -r41467:41531 ^/trunk/blenderBrecht Van Lommel
2011-11-03Fix #28935: Material display error VBO + Texture Solid + ModifierSergey Sharybin
2011-10-25Cycles: svn merge -r41225:41232 ^/trunk/blenderBrecht Van Lommel
2011-10-23remove $Id: tags after discussion on the mailign list: ↵Campbell Barton
http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-22Cycles: svn merge -r41182:41205 ^/trunk/blenderBrecht Van Lommel
2011-10-22BLI_utildefine minor editsCampbell Barton
- removed AVG2, was only used once. - remove unused LONGCOPY define. - removed BLI_STRUCT_OFFSET, was only used once, replce with offsetof - formatting edits, split some macros over multiple lines.
2011-10-11Cycles: svn merge -r40411:40934 ^/trunk/blenderBrecht Van Lommel
2011-09-23some speedup for drawing mesh in texture mode.Campbell Barton
- only pass if the mesh has vertex colors to drawParams() rather then the mcol its self, this saves a lookup on the color. - drawing textures in editmode with no vertex colors would still lookup vertex colors on each face, instead cache this info for all faces.
2011-09-20Cycles: svn merge -r40358:40411 ^/trunk/blenderBrecht Van Lommel
2011-09-20changes for materials to treat them as shorts not int/chars (since they are ↵Campbell Barton
stored as shorts intermally) - converting nurbs to mesh was casting the material to unsigned char. - subsurf was casting to char, then int -> short in a loop. - have material functions take & return shorts.
2011-09-20fix for warnings after texface commit, also comment blender sphinx theme for ↵Campbell Barton
api reference until we get an update for 'Naiad'
2011-09-19TexFace to Material Settings big patchDalai Felinto
Summary: ======== The idea here is to move the texface options into the material panel. For images with the change please visit: http://code.blender.org/index.php/2011/09/bge-material-texface-changes 1 - Some of the legacy problems 2.49 and 2.5x has with the texface system: ========================================================================== 1.1) Shadow, Bilboard and Halo are mutual exclusive (in the code), yet you can select a face to be more than one mode. 1.2) Sort only works for blend Alpha yet it's an option regardless of the Transparency Blend you pick. 1.3) Shared doesn't affect anything in BGE. 1.4) ObColor only works for Text objects (old bitmap texts) when using Texture Face Materials. (not address yet, I so far ignored obcolor) 2 - Notes: ============ 2.1) Now "Use Face Textures" in material Option panel will work in Multitexture even if there is no texture channel. 2.2) In FaceTexture mode it will use TexFace all the time, even if you don't check the "Use Texture Face" option in the UI. It's a matter of decision, since the code for either way is there. I decided by the solution that makes the creation of a material fast - in this mode the user doesn't need to mess with textures or this "Use Texture Face" option at all. I'm not strong in my opinion here. But I think if we don't have this then what is the point of the Texture Face mode? 2.3) I kept references for tface only when we need the image, UV or the tiling setting. It should help later when/if we split the Image and UV layers from the tface struct (Campbell and Brecht proposal). 3 - Changes in a Nutshell: ========================== 3.1) "Texture Face" panel (in the Mesh/Object Data panel) no longer exists. Those settings are all part of the material properties, visible when Game Render is set. 3.2) "Texture Face" Shading mode (in the Render panel) is now called “Single Texture”, it needs a material for special settings (e.g. Billboard, Alpha Sort, …). 3.3) New options in the Material Panel * Shadeless option in the Material panel is now supported for all three Shading modes. * Physics is now toggleable, this is the old Collision option. * Two Side (on) is now called Back Culling (off). * Alpha Sort is one of the Alpha options, together (and mutually exclusive) to Alpha Blend, Alpha Clip, Add and Opaque (i.e. solid). * Shadow, Billboard and Halo are grouped in the “Face Orientation” property. * "Face Textures" and "Face Textures Alpha" (under Options) can be used for all but GLSL shading mode (to be supported in GLSL eventually). * The backend in the game engine is still the same as before. The only changes are in the interface and in the way you need to think your materials. The bottomline is: It’s no longer possible to share materials between faces that do not share the same game properties. 4 - Acknowledgment: ================== Mike Pan for the design discussions, and testing along the whole development process. Vitor Balbio for the first hands-on code with the interface changes. That helped me a lot to push me into work on that. Benoit Bolsee and Brecht van Lommel for patch review (* no one reviewed the whole patch, or the latest iteractions, so I still hold liability for any problems). Blender artists that gave feedback and helped testing the patch. Patch review and original documentation can be found here: http://wiki.blender.org/index.php/User:Dfelinto/TexFace http://codereview.appspot.com/4289041/
2011-09-17Cycles: svn merge -r39870:r40266 ↵Brecht Van Lommel
https://svn.blender.org/svnroot/bf-blender/trunk/blender Merging the node changes required a lot of conflict resolution, fixed the issues I could find but if you want stability you might want to wait a bit before updating.
2011-09-14resolve bad level calls from blenkenel/ into editors/ & remove editors from ↵Campbell Barton
the include path from CMake & SCons. * ED_curve_editnurbs --> curve_editnurbs * ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-02Cycles: svn merge -r39669:39870 ↵Brecht Van Lommel
https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-08-29Fix #28347: VBO's highlights wrong faces when Mirror modifier is in useSergey Sharybin
Added callback to drawMappedFaces which checks if two faces have got equal draw options. After discussion with Brecht we found it's nicest solution for now: - Disabling VBOs in edit mode for this case wouldn't be nicer for this case - some additional flag stored in DM should be added in this case. - Adding new callback in DM isn't nicer that this solution. - Handling face selection in drawobject would lead to duplicated code which is also not nice. Hopefully, this callback could handle all cases in the future. Also, Brecht mentioned current VBO implementation isn't perfect, so maybe when we'll redesign this area dealing with edit mode wouldn't be so tricky.
2011-08-07Cycles: svn merge -r37957:39132 ↵Brecht Van Lommel
https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-07-11Fix #27921: optimal display with 2 subsurf modifiers fails.Brecht Van Lommel
2011-06-27Cycles: working towards texture workflow designBrecht Van Lommel
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/TextureWorkflow * Added "active texture node" in shading node trees. * Texture draw mode draw active texture node now, and new Material draw mode shows GLSL material. * GLSL materials now match solid draw mode lighting better. * Texture properties can now texture nodes from material/world/lamp.
2011-05-19Fix crash when accessing mesh from python while a mesh with a subsurf modifierBrecht Van Lommel
is in editmode.
2011-05-05Cycles: svn merge -r36352:36495 ↵Brecht Van Lommel
https://svn.blender.org/svnroot/bf-blender/trunk/blender/
2011-05-04Own TODO item: sculpting on constructive modifiersSergey Sharybin
- Constructive modifiers are enabled by default in sculpt mode. - There's option to disable all constructive modifiers in the "Options" panel of toolbox in sculpt mode, - Use one column in options panel to make strings easier to read - No modifiers would still be applied on multires
2011-04-27Blender modifications for Cycles integration.Brecht Van Lommel
Some notes about code status: * The Blender modifications were fairly quickly put together, much more code polish and work is needed to get this to a state where it can be committed to trunk. Files created with this version may not work in future versions. * Only simple path tracing is supported currently, but we intend to provide finer control, and more options where it makes sense. * For GPU rendering, only CUDA works currently. The intention is to have the same kernel code compile for C++/OpenCL/CUDA, some more work is needed to get OpenCL functional. * There are two shading backends: GPU compatible and Open Shading Language. Unfortunately, OSL only runs on the CPU currently, getting this to run on the GPU would be a major undertaking, and is unlikely to be supported soon. Additionally, it's not possible yet to write custom OSL shaders. * There is some code for adaptive subdivision and displacement, but it's far from finished. The intention is to eventually have a nice unified bump and displacement system. * The code currently has a number of fairly heavy dependencies: Boost, OpenImageIO, GLEW, GLUT, and optionally OSL, Partio. This makes it difficult to compile, we'll try to eliminate some, it may take a while before it becomes easy to compile this.
2011-04-24harmless changes to quiet clang static check warnings.Campbell Barton
- made EXPANDED_AGRP take bAnimContext as an argument. - remove unneeded NULL check drawFacesColored functions. - comment some vars which are set but not used.
2011-04-21whitespace only, no functional change mixed tabs/spaces --> tabs.v2.57aCampbell Barton
2011-03-30Fix for old bug with subsurf not initializing normals for edges that had no ↵Campbell Barton
faces, Noted that a floating point exception caused by this r28953. With the render engine using DerivedMesh normals this came up as a memory error when rendering some files. for now zero the normals, could interpolate between vertex normals if needed.
2011-03-03replace 0 with NULL when used as a pointerCampbell Barton
2011-02-27doxygen: blender/blenkernel tagged.Nathan Letwory
2011-02-23doxygen: prevent GPL license block from being parsed as doxygen comment.Nathan Letwory
2011-02-20Fix for crash when sculpting on multires object during playbackSergey Sharybin
- Restored BLI_pbvh_grids_update stuff; - Marc all nodes as changes in ED_sculpt_modifiers_changed, so draw_buffers would be keept correct.
2011-02-14This commit will switch blender to use tangent space generated withinM.G. Kishalmi
the two files mikktspace.h and mikktspace.c. These are standalone files which can be redistributed into any other application and regenerate the same tangent spaces. The implementation is independent of the ordering of faces and the vertex ordering of faces.
2011-01-31Todo issue: sculpting on deformed meshSergey Sharybin
Used a crazyspace approach (like in edit mode), but only modifiers with deformMatricies are allowed atm (currently shapekeys and armature modifiers only). All the rest modifiers had an warning message that they aren't applied because of sculpt mode. Deformation of multires is also unsupported. With all this restictions users will always see the actual "layer" (or maybe mesh state would be more correct word) they are sculpting on. Internal changes: - All modifiers could have deformMatricies callback (the same as deformMatriciesEM but for non-edit mode usage) - Added function to build crazyspace for sculpting (sculpt_get_deform_matrices), but it could be generalized for usage in other painting modes (particle edit mode, i.e) Todo: - Implement crazyspace correction to support all kinds of deformation modifiers - Maybe deformation of multires isn't so difficult? - And maybe we could avoid extra bad-level-stub for ED_sculpt_modifiers_changed without code duplicating?
2011-01-10comment unused vars from subsurf code.Campbell Barton
2011-01-08remove unused code & variables.Campbell Barton
2011-01-07remove references to BKE_utildefines where its not needed.Campbell Barton
- move GS() define into DNA_ID.h - add BLI_utildefines as an automatic include with makesrna generated files.
2011-01-07split BKE_utildefines.h, now it only has blender specific defines like GS() ↵Campbell Barton
MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2010-12-16Fixed bug [#22634] sculpting/multires and wireframe display mode glitchesNicholas Bishop
Added a call to flush sculpting face grid changes out to ccgsubsurf's other data (in particular, to edge grids) Hopefully correct fix this time :)
2010-12-14Fixed bug #23922, Sculpting - Textured display draws incorrectlyNicholas Bishop
Root cause is that some drawing modes don't work with PBVH drawing. Worked around by adding a call to update mesh normals from the PBVH so that sculpted changes appear correctly in those "unsupported" modes. (They'll still draw much more slowly than solid, but should at least appear correct now.)
2010-10-31initialize structs to zero rather then using memset().Campbell Barton
2010-10-25Closing #24367 (Incorrect behaviour for Optimal Display option) and ↵Nicholas Bishop
reopening #22634 (sculpting/multires and wireframe display mode glitches) * Reverting my earlier changes to subsurf edge drawing; seems to be causing more bugs than the minor bug it fixed.
2010-10-24Fixed bug #24364, "subsurf modifier causes wire-only meshes to disappear in ↵Nicholas Bishop
object mode." * Re-added code to draw loose edge
2010-10-20== Sculpt ==Nicholas Bishop
Fixed bug #22634, sculpting/multires and wireframe display mode glitches * Changed ccgdm edge drawing to always use face griddata rather than edge data, since edge data is not updated during sculpting.
2010-10-17- fixed remaining unused warnings.Campbell Barton
- omit render code from this warning (cmake only), until render branch is merged. - moved -Wunused-parameter warning to apply to all C code in blender (not just ./source/blender), (cmake only).
2010-10-05bugfix [#23506] Bevel Modifier display problemCampbell Barton
This is a more general problem that drawing functions would skip faces when the original index could not be found, screw result for example wasnt visible in editmode too. Fixed by adding a material set argument to DerivedMesh->drawMappedFaces(), this was already being done in some of the other drawing functions.
2010-10-05- fix for crash when drawing a subsurf after a modifier that lost original ↵Campbell Barton
indices (bevel/screw/decimate) - fix for own mistake used madd_v3_v3fl rather then mul_v3_v3fl, r32241.
2010-09-17bugfix [#23864] Bevel Modifier + UV crashes under certain conditionsCampbell Barton
2010-08-12Fix #23281: crash with multiresolution and uv project.Brecht Van Lommel
2010-06-11Fixed bug #21348, Hide selection in Edit Mode not working with some ↵Nicholas Bishop
modifiers (VBOs) Was actually a couple bugs: * VBO bug was that hidden faces weren't being skipped correctly. Fixed that and rewrote this bit of VBO drawing code more clearly (less duplication, less unecessary state, and comments even) * Second bug was that CCGDerivedMesh wasn't outputing ORIGINDEX data for faces. (it's not doing it for edges or verts either, but I don't know that we need it to.) At any rate, we do need this data for faces so that additional DerivedMeshes on top of subsurf know what faces in the editmesh are hidden.