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-10-10Merge from trunk r51234-r51251soc-2012-fried_chickenDaniel Genrich
2012-10-09Merging revisions 51077-51234 from trunkDaniel Genrich
2012-10-05Merge with trunk r51077Miika Hamalainen
2012-10-05more improvements to logic for selection/projection: replace ↵Campbell Barton
ED_view3d_project_short_global() with ED_view3d_project_int_object() in some places.
2012-10-05Bugfix [#32760] Crash on entering pose mode if motion paths have no baked pointsJoshua Leung
Dunno how a file with this situation arose, but we now perform some more sanity checking to abort in this sticky situation.
2012-10-05fixes/minor improvements to circle select in armature and pose mode.Campbell Barton
- pose mode now checks if circle select intersects the bone if neither head/tail are reached (as with editmode) - checking if the mouse intersects with the bone now checks that neither projection failed. - use ED_view3d_project_int_object rather then the global version.
2012-10-05fix for circle select ignoring lock selection option for pose and edit ↵Campbell Barton
modes, added macros PBONE_SELECTABLE, EBONE_SELECTABLE
2012-10-05replace ED_view3d_project_short_* with ED_view3d_project_int_*, when the ↵Campbell Barton
result was converted to an int after. also optimization for particle editmode key_test_depth() was projecting the screen coords, but all callers had already done this, so pass an arg.
2012-10-05fix for bug in loop select, picking the active vert/edge/face was using ↵Campbell Barton
global space checks on object space coordinates. this removes last use of ED_view3d_project_float_noclip().
2012-10-05replace ED_view3d_project_float with ED_view3d_project_float_globalCampbell Barton
2012-10-05add ED_view3d_project_float_global, ED_view3d_project_float_object, ↵Campbell Barton
ED_view3d_project_float_ex function calls and cleanup cursor3d set function which had some odd logic.
2012-10-05Cycles: add "From Dupli" option for texture coordinate node. This gets theBrecht Van Lommel
Generated and UV coordinates from the duplicator of instance instead of the object itself. This was used in e.g. Big Buck Bunny for texturing instanced feathers with a UV map on the bird. Many files changed, mainly to do some refactoring to get rid of G.rendering global in duplilist code.
2012-10-04make ED_view3d_project_int equivalent to ED_view3d_project_short functions.Campbell Barton
2012-10-04refactor ED_view3d_project_short & ED_view3d_project_short_noclip,Campbell Barton
This is apart of a code cleanup to make ED_view3d_project_short/ED_view3d_project_int/ED_view3d_project_float interchangeable. Currently they work very differently in a way thats quite confusing (and cause of bugs in blender that remain uncorrected) - fixes coming. There are also cases where ED_view3d_project_short is used, then the values are converted from shorts into int's after because ED_view3d_project_int() behaves differently, will unify behavior of these functions after this commit. - rather then clip/noclip versions, pass flags (for bound-box clip, window clip). - rather then store the invalid clip-value, return success (or error value clip_near, clip_bb, clip_win, overflow). - remove local copies of project functions from drawobject.c: view3d_project_short_clip, view3d_project_short_noclip, view3d_project_short_clip_persmat. add functions: - ED_view3d_project_short_global() global space projection - ED_view3d_project_short_object() object space projection. - ED_view3d_project_short_ex() take perspective matrix and local space option as args. - ED_view3d_project_base() - special function to set the Object 'Base' screen coords (sx, sy), since this is a common enough operation.
2012-10-04style cleanup: comment blocksCampbell Barton
2012-10-02fix for mesh_foreachScreenEdge__mapFunc running the callback with ↵Campbell Barton
V3D_CLIP_TEST_RV3D_CLIPPING'd verts. (used uninitialised stack memory)
2012-10-01Fix #32695: Can't disable color management for 3D viewSergey Sharybin
Made it so viewport will disable color management if display device set to None. This solves couple of regressions, mainly related on old BGE files and made None display behave exactly as old color management disabled.
2012-09-30style cleanupCampbell Barton
2012-09-28code cleanup: correct spellingCampbell Barton
2012-09-27don't draw the object center circle when in sculpt mode (all other paint ↵Campbell Barton
modes have it disabled).
2012-09-27style cleanup: also correct incorrect doxy headingCampbell Barton
2012-09-25Fixed crash when selecting curve with a mouseSergey Sharybin
Was a missed check for DRAW_CONSTCOLOR flag.
2012-09-22Fix [#32629] Checking "Invert Zoom Direction" doesn't change zoom in camera ↵Bastien Montagne
view.
2012-09-20code cleanup: some redundant assignments in view3d_draw_bgpic()Campbell Barton
2012-09-20code cleanup:Campbell Barton
- make view3d project names more consistent. - remove apply_project_float() its not needed. - update comments referencing an old function name. - move doxygen docs into the C file, prefer they are kept here to avoid getting out of sync with code.
2012-09-20code cleanup: remove unused macros, commet some which may be useful later - ↵Campbell Barton
or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc
2012-09-19code cleanup: make shape key api names consistent with our new convention.Campbell Barton
2012-09-19fix buffer overrun when 5+ sided faces were used for text drawing.Campbell Barton
2012-09-19code cleanup: marker transform was doing some redundant/misleading ↵Campbell Barton
assignments & checks, remove unused cruft. also remove some other redundant checks.
2012-09-18fix for a strange linking error where set_property() in ↵Campbell Barton
source/blender/blenkernel/intern/property.c would get mixed up with an X11 function of the same name. it crashed blender loading on my system. Give functions in property.c more unique names.
2012-09-18code cleanup: remove unused definesCampbell Barton
2012-09-15Merged this part of code by mistake.Sergey Sharybin
2012-09-15code cleanup: replace macro for BLI_rect size/center with inline functions.Campbell Barton
2012-09-15Color Management, Stage 2: Switch color pipeline to use OpenColorIOSergey Sharybin
Replace old color pipeline which was supporting linear/sRGB color spaces only with OpenColorIO-based pipeline. This introduces two configurable color spaces: - Input color space for images and movie clips. This space is used to convert images/movies from color space in which file is saved to Blender's linear space (for float images, byte images are not internally converted, only input space is stored for such images and used later). This setting could be found in image/clip data block settings. - Display color space which defines space in which particular display is working. This settings could be found in scene's Color Management panel. When render result is being displayed on the screen, apart from converting image to display space, some additional conversions could happen. This conversions are: - View, which defines tone curve applying before display transformation. These are different ways to view the image on the same display device. For example it could be used to emulate film view on sRGB display. - Exposure affects on image exposure before tone map is applied. - Gamma is post-display gamma correction, could be used to match particular display gamma. - RGB curves are user-defined curves which are applying before display transformation, could be used for different purposes. All this settings by default are only applying on render result and does not affect on other images. If some particular image needs to be affected by this transformation, "View as Render" setting of image data block should be set to truth. Movie clips are always affected by all display transformations. This commit also introduces configurable color space in which sequencer is working. This setting could be found in scene's Color Management panel and it should be used if such stuff as grading needs to be done in color space different from sRGB (i.e. when Film view on sRGB display is use, using VD16 space as sequencer's internal space would make grading working in space which is close to the space using for display). Some technical notes: - Image buffer's float buffer is now always in linear space, even if it was created from 16bit byte images. - Space of byte buffer is stored in image buffer's rect_colorspace property. - Profile of image buffer was removed since it's not longer meaningful. - OpenGL and GLSL is supposed to always work in sRGB space. It is possible to support other spaces, but it's quite large project which isn't so much important. - Legacy Color Management option disabled is emulated by using None display. It could have some regressions, but there's no clear way to avoid them. - If OpenColorIO is disabled on build time, it should make blender behaving in the same way as previous release with color management enabled. More details could be found at this page (more details would be added soon): http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management -- Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO integration and to Brecht van Lommel for some further development and code/ usecase review!
2012-09-15code cleanup: remove paranoid NULL checks (these cases would crash earlier ↵Campbell Barton
of the vars were in fact NULL)
2012-09-15quiet -Wmissing-prototypes warnings, and enable this warning by default for ↵Campbell Barton
C with gcc. helps for finding unused functions and making functions static, also did some minor code cleanup.
2012-09-14fixes for NULL checks, remove some redundant checks and add some in that ↵Campbell Barton
have been removed by accident as code has been updated.
2012-09-10code cleanup: use BMEdit_FromObject() rather then me->edit_btmesh in more ↵Campbell Barton
places.
2012-09-09style cleanup:Campbell Barton
also remove some redundant conversions int -> short -> int
2012-09-07remove makeDerivedMesh from ED_mesh_pick_face(), this was added 44256 (bmesh ↵Campbell Barton
merge), but is pretty bad (rebuilding entire derived mesh to pick a face), tested with subsurf modifier, sintel mesh - it works ok without it. Also - other select modes like border-select dont do this, so looks safe to disable.
2012-09-07code cleanup: header had many incorrect sections for function/file, also ↵Campbell Barton
rename mouse_mesh() --> EDBM_select_pick()
2012-09-07code cleanup: move vertex and face picking functions into meshtools.cCampbell Barton
2012-09-07code cleanupCampbell Barton
2012-09-06Fix wrong cycles tile size in viewport, could affect performance a bit.Brecht Van Lommel
2012-09-05fix for various redundant checks and possibly fix some crashes in rare ↵Campbell Barton
situations.
2012-09-04stule cleanupCampbell Barton
2012-09-04Cycles: merge of changes from tomato branch.Brecht Van Lommel
Regular rendering now works tiled, and supports save buffers to save memory during render and cache render results. Brick texture node by Thomas. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture Image texture Blended Box Mapping. http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture http://mango.blender.org/production/blended_box/ Various bug fixes by Sergey and Campbell. * Fix for reading freed memory in some node setups. * Fix incorrect memory read when synchronizing mesh motion. * Fix crash appearing when direct light usage is different on different layers. * Fix for vector pass gives wrong result in some circumstances. * Fix for wrong resolution used for rendering Render Layer node. * Option to cancel rendering when doing initial synchronization. * No more texture limit when using CPU render. * Many fixes for new tiled rendering.
2012-09-04fix for building on msvc2008 (also style cleanup)Campbell Barton
2012-09-03fix [#31694] Circle Selection is ignored within face selection in texture ↵Campbell Barton
paint mode
2012-09-03add endian switch functions to replace macros SWITCH_INT/LONG/SHORT, with ↵Campbell Barton
BLI_endian_switch_int32/int64/float/double...