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
2012-08-18Moving more duplicate code from GPU_create_gl_tex_compressed() and ↵Mitchell Stokes
BL_Texture::InitGLCompressedTex() into GPU_Upload_dxt_texture(). This reduces code duplication and ensures that both paths are using the same settings.
2012-08-12style cleanupCampbell Barton
2012-08-11simplified data_to_c macro in cmakeCampbell Barton
2012-08-11generate glsl shaders c files at build time.Campbell Barton
2012-08-04style cleanupCampbell Barton
2012-07-31Tweak to commit related to non-power-of-two textures, some cards claim toBrecht Van Lommel
support this but actually don't, so use the function that checks for that.
2012-07-29Fix for [#27484] "Run-time command line options don't work in Multi-texture ↵Mitchell Stokes
mode." reported by Josiah Lane (solarlune). The -g nomipmap = 1 option only changed the mipmapping option for bf_gpu, which BL_Texture wasn't checking.
2012-07-26Fix #32138: material trancpareny settingSergey Sharybin
2012-07-24BGE: Bringing over the dynamic lamp properties fixes from Cucumber (thanks ↵Mitchell Stokes
to Daniel Stokes). This means the following KX_LightObject properties now have support when using GLSL materials (in addition to those already supported): * distance * lin_attenuation * quad_attenuation * spotsize * spotblend
2012-07-17code cleanup: spellingCampbell Barton
2012-07-10Scaling non-power-of-two (NPOT) textures to powers of two is really time ↵Mitchell Stokes
consuming and not necessary on graphics cards that can support NPOT textures. So, if the graphics card has NPOT texture support, don't bother scaling. If this patch causes issues, it can always be reverted and applied to Swiss instead.
2012-07-08style cleanupCampbell Barton
2012-07-04Spellfixes: colour -> colorBastien Montagne
2012-07-01A little bit of cleanup for the new DXT code:Mitchell Stokes
* Using TRUE/FALSE instead of 1/0 * Checking to make sure GL_EXT_texture_compression_s3tc is supported * Removing some debug error checking
2012-06-30fix for some build warnings.Campbell Barton
2012-06-30GPU_upload_dxt_texture failed to compile if WITH_DDS was not definedJason Wilkins
2012-06-30Finally committing support for compressed textures on the GPU (DDS+DXT). ↵Mitchell Stokes
This patch started out as a patch by me, then cleaned up by Kupoman during his work on Cucumber. One important thing to keep in mind when using this feature is that you'll need to flip your textures vertically (both the GIMP and Photoshop DDS tools I've seen have support for this on export). This is a quirk in using a texture format originally made for DirectX/DirectDraw, and flipping the compressed data is a real headache. Another quick fix for this issue is to change the Y value for the Size in the Mapping panel in the Texture properties to -1 (default is 1).
2012-06-20style cleanupCampbell Barton
2012-06-17style cleanup:Campbell Barton
also fix for building ghost test and fix double free in one of the tests
2012-06-11Add user preference "GPU Mipmap Generation" under the System/OpenGLAntony Riakiotakis
subpanel to calculate image mipmapping on the GPU, saving upload and calculation time. Default is off just in case.
2012-06-08Index: source/blender/gpu/intern/gpu_draw.cAntony Riakiotakis
=================================================================== --- source/blender/gpu/intern/gpu_draw.c (revision 47568) +++ source/blender/gpu/intern/gpu_draw.c (working copy) @@ -230,11 +230,12 @@ Image *ima, *curima; int domipmap, linearmipmap; + int texpaint; /* store this so that new images created while texture painting won't be set to mipmapped */ int alphablend; float anisotropic; MTFace *lasttface; -} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, -1, 1.f, NULL}; +} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.f, NULL}; /* Mipmap settings */ @@ -256,7 +257,7 @@ static int gpu_get_mipmap(void) { - return GTS.domipmap; + return GTS.domipmap && !GTS.texpaint; } static GLenum gpu_get_mipmap_filter(int mag) @@ -730,6 +731,8 @@ if (!GTS.domipmap) return; + GTS.texpaint = !mipmap; + if (mipmap) { for (ima=G.main->image.first; ima; ima=ima->id.next) { if (ima->bindcode) {
2012-06-07style cleanupCampbell Barton
2012-06-06style cleanupCampbell Barton
2012-06-05Fix #31593: Every time I switch between edit and object mode, it crashesSergey Sharybin
Crash was caused by incorrect restoring OpenGL context due to some weird bit operations used to indicate whether stuff like color arrays is initialized resulting in some unpredictable results on different platforms and drivers.
2012-06-05style cleanupCampbell Barton
2012-05-28style cleanup: defines with bracesCampbell Barton
2012-05-25style cleanupCampbell Barton
2012-05-253D View: add Backface Culling option, to hide faces when seen from the back ↵Brecht Van Lommel
side, found in the Display panel. Patch by Simon Kirk and Irie Shinsuke, refactored to also work for non-mesh objects and avoid globals.
2012-05-24style cleanup: brace placement/newlinesCampbell Barton
2012-05-23style cleanupCampbell Barton
2012-05-22Fix memory leak when deleting all vertices from mesh with certain modifiers ↵Antony Riakiotakis
(bevel and array among them) and VBO are enabled.
2012-05-22style cleanup: brace placement.Campbell Barton
2012-05-21Cycles: add Object Info node, with outputs object location, object/materialBrecht Van Lommel
pass index, and a random number unique to the instance of the object. This can be useful to give some variation to a single material assigned to multiple instances, either manually controlled through the object index, based on the object location, or randomized for each instance. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Object_Info
2012-05-21Fix #31511: GLSL preview is much darker than F12 resultsDaniel Stokes
A problem caused by Harmony branch code. A value was being set improperly for the GLSL shader.
2012-05-20code cleanup:Campbell Barton
- style - multi-line ifs move braces onto new lines. - iterators - convert some to macros, other split up and move brace.
2012-05-19code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also ↵Campbell Barton
replace do prefix with do_ for bool vars.
2012-05-18Fix related to #31446: cycles glsl error with empty image texture node.Brecht Van Lommel
2012-05-17style cleanup: block commentsCampbell Barton
2012-05-16Code cleanup: simplify standard GHash creation.Nicholas Bishop
Added four new functions as shortcuts to creating GHashes that use the standard ptr/str/int/pair hash and compare functions. GHash *BLI_ghash_ptr_new(const char *info); GHash *BLI_ghash_str_new(const char *info); GHash *BLI_ghash_int_new(const char *info); GHash *BLI_ghash_pair_new(const char *info); Replaced almost all occurrences of BLI_ghash_new() with one of the above functions.
2012-05-11style cleanup: mainly sculpt/whitespaceCampbell Barton
2012-05-11Add mask-drawing support to GPU_Buffers.Nicholas Bishop
This is the last commit of the sculpt masking merge. Documentation: http://wiki.blender.org/index.php/User:Nicholasbishop/PaintMasks Thanks to Brecht for reviewing! * For VBO, add color to the VertexBufferFormat structure as three unsigned bytes. Since mask elements are scalar the three color components are identical to eachother, but the fixed-function OpenGL pipeline requires colors to be either three or four components. * For the same reason, multires VBO drawing now copies into the VertexBufferFormat format as well. * Regression: material colors will not show up correctly now, masks colors are overriding. Not sure how to fix this nicely (would be much easier to fix if drawing with vertex shaders.) * Also, masks will only draw PBVH drawing, so only 'solid' drawing will work correctly with masks.
2012-05-11Use VertexBufferFormat for multires VBO.Nicholas Bishop
2012-05-11Replace hardcoded DMGridData structure with CCGElem/CCGKey.Nicholas Bishop
* Changes to DerivedMesh interface: DMGridData has been removed, getGridData() now returns an array of CCGElem pointers. Also added getGridKey() to initialize a CCGKey (implemented only by CCGDerivedMesh.) * PBVH: added BLI_pbvh_get_grid_key(). * A lot of code is affected, but mainly is just replacing DMGridData.co, DMGridData.no, and sizeof(DMGridData) with the CCG_*_elem functions, removing the reliance on grid elements of exactly six floats.
2012-05-09Fix for recent changes in glslSergey Sharybin
smooth seems to be a keyword in glsl and using it as a name for function property caused issues.
2012-05-09style cleanup: whitespace/operatorsCampbell Barton
2012-05-08Cycles: add light falloff node, with quadratic/linear/constant falloff and aBrecht Van Lommel
smoothing factor to reduce high values near the light. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Light_Falloff Note that this was already possible to do manually with the Ray Length, but this adds a convenient node for it. This commit also makes the mapping node min/max option work, fixing #31348.
2012-05-05code cleanup: naming - pose/armature/image Campbell Barton
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05code cleanup: BKE_scene api naming.Campbell Barton
also stop numpy from being found in /usr/include with cmake.
2012-05-05code cleanup: function naming, use BKE_*type* prefix.Campbell Barton
2012-05-04Renamed "fake" OpenGL identifiers.Jason Wilkins
Any identifier that looks like an OpenGL identifier, but isn't, causes a false alarm by the glreport.py tool. Most of these were in comments so I just rephrased the comments. There were a couple of static functions/macros that were easy enough to rename. Only the glTexco and glIndex fields of the DMVertexAttribs struct was public and had non-local uses.