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-09-20Merging r40366 through r40392 from trunk into soc-2011-garlicsoc-2011-garlicSergey Sharybin
2011-09-20committed change to transforms THRESHOLD by accident, also update ↵Campbell Barton
convenience makefile to regenerate real makefiles before static checking.
2011-09-20tag & comment unused vars with /* UNUSED */Campbell Barton
2011-09-20Minor: Other UI strings typos and tweaks.Bastien Montagne
2011-09-20i18n: replace some bit checks from U.transopts with utility functions ↵Sergey Sharybin
UI_translate*
2011-09-20i18n: code clean-upSergey Sharybin
- Move all translation-related declarations to BLF_translation.h - Reverted some changes to match trunk svn rev40365
2011-09-20fix from Juha Mäki-Kanto (kanttori), was calculating connectivity data when ↵Campbell Barton
proportional editmode was enabled, even if connectivity setting was off.
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 possible crasg in recent texface commit - material pointer could be used ↵Campbell Barton
un-inirialized.
2011-09-20tidy upCampbell Barton
- quiet some warnings - set some functions static - replace materialbyname with generic BLI_findstring call
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-19style changes & use faster looping on vertex weights, also loop on face ↵Campbell Barton
verts in more places rather then having code for 3-4 verts.
2011-09-19SVN maintenance.Guillermo S. Romero
2011-09-19remove unused arg & some style edits on radish merge, also reverted odd ↵Campbell Barton
change that somehow got in to cmake preset.
2011-09-19Merging radish branch into trunk.Jason Hays
http://wiki.blender.org/index.php?title=User:Jason_hays22/GSoC-2011
2011-09-19Merging r40345 through r40365 from trunk into soc-2011-garlicSergey Sharybin
2011-09-19Merged 40338-40364soc-2011-radishJason Hays
2011-09-19vgroup_validmap needed to be assigned when locks were active.Jason Hays
2011-09-19i18n: code cleanup and fixing unneeded translation (when partial translation ↵Sergey Sharybin
is used only)
2011-09-19Sequencer: switching to preview mode works fine againSergey Sharybin
2011-09-19/blender/editors: Removed final points in UI strings and messages.Bastien Montagne
Plus a few cuts in very long lines…
2011-09-19svn merge -r40222:40344 ^/trunk/blenderSergey Sharybin
2011-09-19i18n: do not translate obect mode enum and transform orientation enum if UI ↵Sergey Sharybin
translation is disabled
2011-09-19Fix for add hook/vertex parent for meshesSergey Sharybin
The only way to achieve this is to re-load editMesh. After this commit you can't iterate through vertices and insert hooks/parents from script anymore -- this operators are now treated as topology-changing and shouldn't be used when iterating via geometries.
2011-09-19svn merge ^/trunk/blender -r40311:40338Campbell Barton
2011-09-19remove duplicate variable - wpaint_make_validmap(ob) was being called twice ↵Campbell Barton
for no good reason.
2011-09-19refactor wpaint_stroke_update_step not to call expensive functions ↵Campbell Barton
per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19edits to radish before merge with trunkCampbell Barton
- removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-18Split do_weight_paint_vertex() to isolate the simple case.Jason Hays
Added a tool-tip to the "fix deforms" op. Removed code markers: "Radish"
2011-09-18allow multiple bones to be selected in weight paint mode in a less ↵Campbell Barton
complicated way (allow Shift+RMB)
2011-09-18style changes onlyCampbell Barton
2011-09-18replace malloc of a single DeformVertex with stack variable.Campbell Barton
2011-09-18add back GPL2+ header to paint_utils.c, copied from editface.c since some of ↵Campbell Barton
its functions trace back to that file from 2.4x. (imapaint_tri_weights for eg).
2011-09-18Minor: Other UI strings typos and tweaks.Bastien Montagne
2011-09-18Changed the branch code markers to say "Radish" in response to a review.Jason Hays
They weren't & aren't meant to show ownership, they just help me navigate my related code.
2011-09-18rename EM_backbuf_checkAndSelectTVerts to ↵Campbell Barton
EM_backbuf_checkAndSelectVerts_obmode until we come up with a better name this one at least says its in object mode, also there is no such thing as a TVert.
2011-09-18svn merge -r40197:40311 ^/trunk/blenderCampbell Barton
2011-09-18Console Scrolling - reset while typing.Campbell Barton
patch from Damir Prebeg with some edits. Also made it so resizing the console view keeps the lower part of the text in view (could be annoying when you needed to scroll because of a resized view).
2011-09-18I made multitude of fixes based on the comments provided online:Jason Hays
Removed the drawSelectedVerts and added drawSelectedVertices, which uses dm->foreachMappedVert. In calc_weightpaint_vert_color(): Made the weight paint color black and return instead of input=-1 Made the pose bone selection normal when multi-paint is inactive. Name fix for functions using mv instead of mvert. Used vector functions provided by the math lib. Changed some MEM_callocN references to be stacks. Changed dm_deform_clear to use ob->derivedDeform primarily Made the variable "float **changes" into "float (*changes)[2]" Used CTX_data_active_object() in place of CTX_data_pointer_get_type() Added the invert selection hotkey "Ctrl+I" to weight paint's vertex mask.
2011-09-18i18n: replace gnu unifont with droid sans fontSergey Sharybin
- Static variables can be initialized with constants only. - Removed bunifont.ttf.c from datafiles -- it's not actually a data file. Unicode font loading stuff is not in blenkernel/font.c - Allocate as much memory for unzipped data as it's needed. Default read chunk is 512Kb. - Fixed regression (or just a typo) in setting utf locale. - Default locale set to en_US:en works fine now. - Commented put Nepali language in user preferences -- it's not supported by current droid font and imo it's better to have nice font for languages we actually have translation for rather than allowing to choose more languages in user preferences.
2011-09-17image button was hard coded to draw the splash screen which it loaded from ↵Campbell Barton
PNG data on every draw. now pass the ImBuf when callign the image button so we could have different images in buttons later on.
2011-09-17Minor: fixing other UI typos.Bastien Montagne
2011-09-17use macros RAD2DEG & DEG2RAD rather then multiplying by 180.0/M_PI or M_PI/180.0Campbell Barton
2011-09-17Minor: fixing an UI typo.Bastien Montagne
2011-09-17more mini optimizations - don't call UI_ThemeColor 4 times per curve handle, ↵Campbell Barton
instead get all colors at the start and index them when drawing curves in editmode. also remove redundant NULL check.
2011-09-17micro optimization for circle drawing.Campbell Barton
- use vertex array for drawcircball() - add circball_array_fill() and call from drawcircball(). - for object center's rather than drawing 2 circles, create the array and reuse it.
2011-09-17use less confusing array syntax for circle drawing, no functional changes.Campbell Barton
2011-09-16WeightVG: added WeightVG icon for outliner (don’t know when that where ↵Bastien Montagne
lost...).
2011-09-16- fix for memory leak in findFreeNavPolyIndex()Campbell Barton
- also correct own script for running cppcheck.
2011-09-16correction for my fix for [#28668], would crash when there were no editbones.Campbell Barton