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
2015-06-04Merge branch 'master' into gooseberryLukas Tönne
Conflicts: intern/cycles/kernel/svm/svm.h
2015-06-02Fix compilation error after recent commitSergey Sharybin
2015-06-02Fix T44921: Node editor, nodes position not maintained after Material panel ↵Sergey Sharybin
changes Also improved a bit behavior of adding new nodes, now they will not overlap that badly. Still not ideal, but further improvements better not to happen at bcon4.
2015-05-26Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/object/object_ops.c
2015-05-23Fix (unreported) broken RNA Image pack handling since multiview merge.Bastien Montagne
Was breaking loading of embedded FBX images (among other things, most likely).
2015-05-15Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/animation/anim_draw.c
2015-05-15Cleanup: style, spellingCampbell Barton
2015-05-14Merge branch 'master' into gooseberrySergey Sharybin
Conflicts: build_files/scons/tools/Blender.py source/blender/blenkernel/intern/mesh.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle_system.c source/blender/editors/interface/interface_handlers.c
2015-05-12Depsgraph: Add additional relations/id update tagsSergey Sharybin
This calls are not strictly speaking needed for the old dependency graph, but due to more granular nature of upcoming depsgraph more actions requires update of relations of IDs. On the one hand this extra tags could be wrapped with if() statements, but on the other hand it makes sense to keep tag in sync so it's clear if some issue is caused by missing/extra tag or by depsgraph itself.
2015-05-04Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/space_sequencer/sequencer_draw.c
2015-05-04Fix Buttons context, invalid object data accessCampbell Barton
Another instance of T44376. Crash where the Python context would access a stale pointer to the active object.
2015-04-28Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: intern/cycles/blender/blender_object.cpp intern/cycles/blender/blender_sync.h source/blender/editors/interface/interface_utils.c
2015-04-27Cleanup: rename GRAB_POINTER -> GRAB_CURSORCampbell Barton
Term pointer is overloaded already.
2015-04-22Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/editors/interface/interface_handlers.c source/blender/editors/space_sequencer/sequencer_draw.c
2015-04-21BLI_string: add BLI_snprintf_rlenCampbell Barton
use when the length of the destination string is needed.
2015-04-21Merge branch 'alembic' into gooseberryLukas Tönne
Conflicts: source/blender/editors/space_view3d/drawvolume.c
2015-04-20Cleanup: use bool /w flag checksCampbell Barton
2015-04-08Merge branch 'wiggly-widgets' into gooseberryJulian Eisel
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/include/ED_transform.h source/blender/windowmanager/intern/wm_operators.c
2015-04-08Merge branch 'master' into gooseberryAntony Riakiotakis
2015-04-07Multiview: compositor was not updating when multiview was offDalai Felinto
2015-04-07Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenloader/intern/versioning_270.c
2015-04-07Merge branch 'master' into gooseberryAntony Riakiotakis
Conflicts: source/blender/blenkernel/intern/image.c source/blender/blenkernel/intern/object_dupli.c source/blender/blenkernel/intern/sequencer.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_view3d/view3d_draw.c source/blender/editors/space_view3d/view3d_ops.c source/blender/makesdna/DNA_sequence_types.h source/blender/makesdna/DNA_view3d_types.h source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/intern/wm_operators.c source/blenderplayer/bad_level_call_stubs/stubs.c
2015-04-07Revert Sticky Keys (and everything related to that)Julian Eisel
Our current keymap doesn't give us enough room to make such changes in the event system. To fix small issues caused by this, we would need to do drastic changes in Blender's keymaps and internal handling. It was worth a try, but it didn't work. I can write down a more descriptive statement in a few days, but for now I need a break of this stuff.
2015-04-07Various Sticky fixes (tm)Julian Eisel
* Revert 776bfa64a53191b and c3dad7953afccd4 (some X11 systems are doing stupid things forcing me to do an extra check that completely breaks the click type handling on other systems using the slightly changed implementation from those commits - see T44278) * Fix sample lines in Compositor+VSE (And yes, this time I tested on both of my systems to make sure everything is fine)
2015-04-06Multi-View and Stereo 3DDalai Felinto
Official Documentation: http://www.blender.org/manual/render/workflows/multiview.html Implemented Features ==================== Builtin Stereo Camera * Convergence Mode * Interocular Distance * Convergence Distance * Pivot Mode Viewport * Cameras * Plane * Volume Compositor * View Switch Node * Image Node Multi-View OpenEXR support Sequencer * Image/Movie Strips 'Use Multiview' UV/Image Editor * Option to see Multi-View images in Stereo-3D or its individual images * Save/Open Multi-View (OpenEXR, Stereo3D, individual views) images I/O * Save/Open Multi-View (OpenEXR, Stereo3D, individual views) images Scene Render Views * Ability to have an arbitrary number of views in the scene Missing Bits ============ First rule of Multi-View bug report: If something is not working as it should *when Views is off* this is a severe bug, do mention this in the report. Second rule is, if something works *when Views is off* but doesn't (or crashes) when *Views is on*, this is a important bug. Do mention this in the report. Everything else is likely small todos, and may wait until we are sure none of the above is happening. Apart from that there are those known issues: * Compositor Image Node poorly working for Multi-View OpenEXR (this was working prefectly before the 'Use Multi-View' functionality) * Selecting camera from Multi-View when looking from camera is problematic * Animation Playback (ctrl+F11) doesn't support stereo formats * Wrong filepath when trying to play back animated scene * Viewport Rendering doesn't support Multi-View * Overscan Rendering * Fullscreen display modes need to warn the user * Object copy should be aware of views suffix Acknowledgments =============== * Francesco Siddi for the help with the original feature specs and design * Brecht Van Lommel for the original review of the code and design early on * Blender Foundation for the Development Fund to support the project wrap up Final patch reviewers: * Antony Riakiotakis (psy-fi) * Campbell Barton (ideasman42) * Julian Eisel (Severin) * Sergey Sharybin (nazgul) * Thomas Dinged (dingto) Code contributors of the original branch in github: * Alexey Akishin * Gabriel Caraballo
2015-04-03Merge branch 'cycles_point_density' into gooseberryLukas Tönne
2015-04-03Color support for point density texture in Cycles.Lukas Tönne
This extends the point density evaluation to also store RGB color values in the array provided by Cycles. Since internally all Cycles textures are 4-float RGBA textures anyway, it does not make a lot of sense to store density and color separately. This could eventually be preferable to avoid unnecessary storage.
2015-04-03Sticky Keys backendJulian Eisel
Design task: T42339 Differential Revision: D840 Initial implementation proposal: T41867 Short description: With this we can distinguish between holding and tabbing a key. Useful is this if we want to assign to operators to a single shortcut. If two operators are assigned to one shortcut, we call this a sticky key. More info is accessible through the design task and the diff. A few people that were involved with this: * Sean Olson for stressing me with this burden ;) - It is his enthusiasm that pushed me forward to get this done * Campbell and Antony for the code and design review * Ton for the design review * All the other people that gave feedback on the patch and helped to make this possible A big "Thank You" for you all!
2015-03-31Merge branch 'cycles_point_density' into gooseberrySergey Sharybin
2015-03-31Cycles: Point density texture experimentSergey Sharybin
This commit implements point density texture for Cycles shading nodes. It's done via creating voxel texture at shader compilation time, Not totally memory efficient, but avoids adding sampling code to kernel (which keeps render time as low as possible), In the future this will be compensated by using OpenVDB for more efficient storage of sparse volume data. Sampling of the voxel texture is happening at blender side and the same code is used as for Blender Internal's renderer. This texture is controlled by only object, particle system and radius. Linear falloff is used and there's no turbulence. This is because falloff is expected to happen using Curve Mapping node. Turbulence will be done as a distortion on the input coordinate. It's already possible to fake it using nose textures and in the future we can add more proper turbulence distortion node, which then could also be used for 2D texture mapping. OSL is not currently supported. There's no actual stoppers for support it, but so far it's not really a priority at this point. Reviewers: campbellbarton, juicyfruit, brecht Subscribers: campbellbarton, dingto, eyecandy Differential Revision: https://developer.blender.org/D1208
2015-03-30Merge branch 'master' into gooseberrySergey Sharybin
Conflicts: release/scripts/startup/bl_ui/properties_physics_smoke.py source/blender/editors/include/ED_transform.h source/blender/editors/space_view3d/view3d_intern.h
2015-03-28Cleanup: redundant struct declarationsCampbell Barton
2015-03-27Cleanup: use const char for stats argCampbell Barton
2015-03-27Compositor: Cleanup, remove unused need_sync parameterSergey Sharybin
2015-03-27Compositor: Followup to previous stats commitSergey Sharybin
No need to mark tree for localization, it was never done and it all just worked. We can save some CPU ticks by skipping doing this.
2015-03-17Merge branch 'master' into gooseberryLukas Tönne
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/include/ED_view3d.h
2015-03-16Nodes: Shortcuts for Snap and Snap Element MenuJulian Eisel
Added Shift + Tab for Snap and Ctrl + Shift + Tab for Snap Element Menu (consistent to 3D View) NOTE: Exit Group is now Ctrl + Tab instead of Shift + Tab
2015-02-11Merge branch 'master' into wiggly-widgetsAntony Riakiotakis
Conflicts: source/blender/blenloader/intern/versioning_270.c
2015-02-11UI: add optional tip callback to uiBut, and use it for per-item tooltips in ↵Bastien Montagne
UIList. When defined, uiBut->tip_func is called when button's tip is generated. This allows for advanced, dynamic generation of tooltips. For now, only used by UIList, which can now optionaly use a given string property of each item for its tooltip. Thanks to Campbell for the reviews!
2015-02-10Separate widget drawing to update and draw phase to make in-scene widgetAntony Riakiotakis
drawing possible (need to update once, draw twice).
2015-02-10Nodes: Various UI cleanups for Image and Environment Texture Nodesjulianeisel
Mainly consistency changes and smaller fixes. * Environment Texture Nodes: ** show image info ** split layout for menus (showing menu title on the left) ** hierarchical button order * Image Nodes: ** disable Alpha Mode menu if Use Alpha is disabled ** Don't show "+" icon/button if an image is already loaded ** Consistent alignment of menu buttons (see Input Color Space menu) Requested and approved by @venomgfx
2015-02-10Nodes: (Un)pack, filepath, refresh buttons for Environment Texture nodesjulianeisel
The same buttons are already used for other image textures and since the environment tex node does only allow images as well, it makes sense to have this here too. Approved by @lukastoenne and @venomgfx, requested by @venomgfx
2015-02-09WIP code to use in scene drawing for widgets.Antony Riakiotakis
2015-02-09Merge branch 'master' into wiggly-widgetsAntony Riakiotakis
Conflicts: source/blender/blenkernel/intern/customdata.c source/blender/makesdna/DNA_customdata_types.h
2015-02-06cleanup: use bool args & redundant castsCampbell Barton
2015-02-05Move priority of widget handler back for node editor. Still not veryAntony Riakiotakis
clean but should allow gooseberrians to work a little better
2015-02-05Merge branch 'master' into wiggly-widgetsAntony Riakiotakis
Conflicts: source/blender/blenloader/intern/versioning_270.c source/blender/editors/object/object_intern.h source/blender/editors/object/object_ops.c source/blender/editors/space_sequencer/sequencer_draw.c source/blender/editors/space_view3d/view3d_draw.c source/blender/makesdna/DNA_customdata_types.h source/blender/makesrna/intern/rna_object.c
2015-02-03Compositor: Implement sampled motion blur for plane track deform nodeSergey Sharybin
Quite striaghtforward change, and in theory we can even try supporting motion blur for the corner pin node (which is tricky because coordinates actually coming from sockets, but with some black magic should be doable).
2015-02-03Possible NULL de-reference on fullsceen checkCampbell Barton
Also quiet some other minor warnings
2015-02-02Fix T43501: Crash on custom node tree creationjulianeisel