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
2017-02-17Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/editors/animation/anim_draw.c
2017-02-15Motion blur investigation featureSergey Sharybin
This commit adds a way to debug Cycles motion blur issues which are usually happening due to something crazy happening in between of frames. Biggest trouble was that artists had no clue about what's happening in subframes before they render. This is at least inefficient workflow when dealing with motion blur shots with complex animation. Now there is an option in Time Line Editor which could be found in View -> Show Subframe. This option will expose current frame with it's subframe to the time line editor header and it'll allow scrubbing with a subframe precision in time line editor. Please note that none of the tools in Blender are aware of subframe, so they'll likely be using current integer frame still. This is something we don't consider a bug for now, the whole purpose for now is to give a tool for investigation. Eventually we'll likely tweak all tools to be aware of subframe. Hopefully now we can finish the movie here in the studio..
2017-02-14Immediate Mode: animation markersDalai Felinto
2017-02-13F-Curve normalization: Do proper curve min/max instead of handle min/maxSergey Sharybin
Would be cool to find some way to cache the results.
2017-02-12OpenGL: enable program point size for keyframesMike Erwin
Allows vertex shader to determine how large to rasterize each point sprite. Forgot to do this before.
2017-02-11OpenGL: draw keyframe markers as point spritesMike Erwin
Also some conversion to new imm mode (T49043). Multiple editors affected. We could push this even further & draw all keyframes in an editor with a single draw call. Something is strange with keyframe markers in blender2.8 -- they're not showing up before or after this commit. They do appear in master. This commit probably needs some follow-up work after keyframes are showing again. Better to share this code now instead of sitting on it.
2017-02-11cleanup from recent commitsMike Erwin
coding style, float literals Converted some (expr / literal) to (expr * literal) where it does not impact readability. Simplified a few function calls.
2017-02-11OpenGL immediate mode: Convert leftover UI_ThemeColor callsLuca Rood
Some `UI_ThemeColor` calls were left in converted files, in some cases because they were just overlooked, and in the case of text drawing, because the new BLF color functions were not yet implemented at the time of conversion. Also converted one `drawcircball` call that was left in transform_constraints.c Part of T49043
2017-02-10De-duplicate min/max calculation in F-Curve normalizationSergey Sharybin
2017-02-10Remove most (maybe all?) remaining yellow textJulian Eisel
Decided to request the text color as argument for UI_fonstyle_draw functions, rather than keeping it being another state to keep track of.
2017-02-07Render Layers and Collections (merge from render-layers)Dalai Felinto
Design Documents ---------------- * https://wiki.blender.org/index.php/Dev:2.8/Source/Layers * https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised User Commit Log --------------- * New Layer and Collection system to replace render layers and viewport layers. * A layer is a set of collections of objects (and their drawing options) required for specific tasks. * A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers. * All Scenes have a master collection that all other collections are children of. * New collection "context" tab (in Properties Editor) * New temporary viewport "collections" panel to control per-collection visibility Missing User Features --------------------- * Collection "Filter" Option to add objects based on their names * Collection Manager operators The existing buttons are placeholders * Collection Manager drawing The editor main region is empty * Collection Override * Per-Collection engine settings This will come as a separate commit, as part of the clay-engine branch Dev Commit Log -------------- * New DNA file (DNA_layer_types.h) with the new structs We are replacing Base by a new extended Base while keeping it backward compatible with some legacy settings (i.e., lay, flag_legacy). Renamed all Base to BaseLegacy to make it clear the areas of code that still need to be converted Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp * Unittesting for main syncronization requirements - read, write, add/copy/remove objects, copy scene, collection link/unlinking, context) * New Editor: Collection Manager Based on patch by Julian Eisel This is extracted from the layer-manager branch. With the following changes: - Renamed references of layer manager to collections manager - I doesn't include the editors/space_collections/ draw and util files - The drawing code itself will be implemented separately by Julian * Base / Object: A little note about them. Original Blender code would try to keep them in sync through the code, juggling flags back and forth. This will now be handled by Depsgraph, keeping Object and Bases more separated throughout the non-rendering code. Scene.base is being cleared in doversion, and the old viewport drawing code was poorly converted to use the new bases while the new viewport code doesn't get merged and replace the old one. Python API Changes ------------------ ``` - scene.layers + # no longer exists - scene.objects + scene.scene_layers.active.objects - scene.objects.active + scene.render_layers.active.objects.active - bpy.context.scene.objects.link() + bpy.context.scene_collection.objects.link() - bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None) + bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None) - bpy.context.object.select + bpy.context.object.select = True + bpy.context.object.select = False + bpy.context.object.select_get() + bpy.context.object.select_set(action='SELECT') + bpy.context.object.select_set(action='DESELECT') -AddObjectHelper.layers + # no longer exists ```
2017-02-06OpenGL immediate mode: interface_draw.c (cont)Clément Foucault
Replaced GL_POLYGON in various places. Ported UI_draw_roundbox_unfilled
2017-01-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/library_query.c
2017-01-31Cleanup: use 'cb_flag', not 'cd_flag' for library_query callbacks.Bastien Montagne
`cd_flag` tends to be used for CustomData flags in mesh area, while for library_query those are rather callback flags...
2017-01-17Revert "Remove particle expander"Antonio Vazquez
This reverts commit 4b99958ca126420c6f288dd9e7aad11232d20dd8.
2017-01-16Merge branch 'master' into blender2.8Bastien Montagne
2017-01-16Cleanup/refactor: move BKE_deform_flip_side_name & co to BLI_string_utilsBastien Montagne
Functions like that do not have anything to do in BKE really, even less when actually more used for bones than vgroups!
2017-01-16Cleanup/refactor: get rid of fixed name limit in BKE_deform_flip_side_name & co.Bastien Montagne
Those were forcing to use vgroup name define in bones area, or even mixing with maxbonename... ugly, and totally avoidable.
2017-01-16OpenGL: convert anim_channel_defines.c to new imm modeBenjamin N. Summerton
This is part of T49043 fixed up some color/rect calls fixed up ANIM_channel_draw() Reviewers: krash, merwin Reviewed By: merwin Tags: #bf_blender_2.8 Maniphest Tasks: T49043 Differential Revision: https://developer.blender.org/D2377
2016-12-29Merge branch 'master' into blender2.8Bastien Montagne
Please **DO NOT** add changes from master when it's totally uneeded! Changes to BLI_ area most certainly shall *always* be done in master, there is absolutely no point in adding more diff between the two branches than needed, will only makes merging more cumbersome! Conflicts: CMakeLists.txt source/blender/blenlib/intern/math_vector_inline.c
2016-12-28Revert particle system and point cache removal in blender2.8 branch.Lukas Tönne
This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-28Fix T50184: Grease Pencil Layer synchronization between Dope Sheet and ↵Joshua Leung
Properties panel
2016-11-16Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-15blender 2.8: OpenGL immediate mode: anim_drawMike Erwin
Reviewers: merwin Reviewed By: merwin Maniphest Tasks: T49043 Differential Revision: https://developer.blender.org/D2353
2016-11-15Implement grouped undo option for operatorsDalai Felinto
This option makes an operator to not push a task to the undo stack if the previous stored elemen is the same operator or part of the same undo group. The main usage is for animation, so you can change frames to inspect the poses, and revert the previous pose without having to roll back tons of "change frame" operator, or even see the undo stack full. This complements rB13ee9b8e Design with help by Sergey Sharybin. Reviewers: sergey, mont29 Reviewed By: mont29, sergey Subscribers: pyc0d3r, hjalti, Severin, lowercase, brecht, monio, aligorith, hadrien, jbakker Differential Revision: https://developer.blender.org/D2330
2016-11-02Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-02Change frame for animations should not bein the UNDO stackDalai Felinto
Request from Hjalti Hjalmarsson for the animation work. Basically a common part of the workflow of animation is to change the pose, scrub back and forth a few times and roll back the changes when unsatisfied. However if you go back and forth too many times the UNDO stack would be full, and it would not be possible to bring back the previous pose. I'm leaving clip_editor change frames as it is for now. But we can probably change the behaviour there as well.
2016-10-15Merge branch 'master' into blender2.8Bastien Montagne
2016-10-14Fix T49571: 2d stabilize keys not visible in the Graph Editor and Dope SheetSergey Sharybin
2016-10-13Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-11Fix T49629: Graph editor normalize function doesn't work on f-curves with a ↵Sergey Sharybin
constant key value Technically it is a regression in behavior and should be 2.78a.
2016-10-07Blender 2.8: OpenGL: replace old GL with the new immediate API in ↵Mike Erwin
UI_draw_roundbox_gl_mode I change UI_draw_roundbox_gl_mode to use immediate API. The rest of the change is the call to the function. I also make some change in UI_ThemeColor4(int colorid) for eg to make convenience to use. I would really like to know if it's the good way to do, if yes I will make all the change in the node_daw.c after, else say me what's wrong and how to deal with color else. Reviewers: merwin, dfelinto, Severin Reviewed By: merwin Subscribers: fablefox, Severin Tags: #bf_blender_2.8, #opengl_gfx Maniphest Tasks: T49043 Differential Revision: https://developer.blender.org/D2274
2016-09-30Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/blenloader/intern/writefile.c
2016-09-28Curve pinning: Allow pinning object data without animated objectSergey Sharybin
Special case, so now we can pin tricky cases like animated camera DOF without requiring to have animation on the object level.
2016-09-23Merge branch 'master' into blender2.8Julian Eisel
Conflicts: intern/ghost/intern/GHOST_ContextCGL.mm intern/ghost/intern/GHOST_WindowCocoa.mm source/blender/makesrna/intern/rna_main.c
2016-09-22Fix non-finite normalization factor in certain casesSergey Sharybin
2016-09-21UI: Make button driver and keying set shortcuts configurableJulian Eisel
2016-09-21UI: Configurable shortcuts for keyframe operatorsJulian Eisel
Adds support for editing the shortcuts for inserting (I), deleting (Alt+I) and clearing (Alt+Shift+I) button keyframes.
2016-09-19UI Messages: Consistent spelling of term "data-block"Julian Eisel
Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) )
2016-09-16Merge branch 'master' into blender2.8Sergey Sharybin
2016-09-16Remove debug only codeSergey Sharybin
Thanks Severin for spotting it!
2016-09-16Tweak for pinned/always visible curves in Graph EditorSergey Sharybin
Allow such kind of pin for armature bones.
2016-09-12Fix code which was commented by accidentSergey Sharybin
Well, more like some last-minute checks which i did not see before commit. Let's increase commit ratio!
2016-09-12Graph editor: Add channel option to make it persistent on displaySergey Sharybin
The idea is to allow certain animation channels to be always visible in animation editors. So, for example, one can pin Camera animation to the editor so it is always possible to refine/tweak camera animation when animating something else in the scene. There is probably some more polishing required, and some current limitations could be solved in the future but should be a good starting point already. Currently only works for object without recursing into deeper datablock (so for example, it's not possible to pin object material animation). Studio request by Colin Levy.
2016-08-21Merge branch 'master' into blender2.8Bastien Montagne
In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/ Conflicts: intern/ghost/intern/GHOST_WindowWin32.cpp source/blender/blenkernel/BKE_effect.h source/blender/blenkernel/BKE_pointcache.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/effect.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/pointcache.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenkernel/intern/smoke.c source/blender/blenkernel/intern/softbody.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/gpu/intern/gpu_debug.c source/blender/makesdna/DNA_object_types.h source/blender/makesrna/intern/rna_particle.c
2016-08-16More fixes from coverity report.Bastien Montagne
2016-08-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: release/scripts/startup/bl_ui/properties_particle.py release/scripts/startup/bl_ui/properties_physics_cloth.py release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py release/scripts/startup/bl_ui/properties_physics_softbody.py source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_query.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/scene.c source/blender/blenkernel/intern/softbody.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_file/filesel.c source/blender/editors/space_outliner/outliner_intern.h source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_object_force.h source/blender/makesdna/DNA_particle_types.h source/blender/makesrna/intern/rna_particle.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blender/makesrna/intern/rna_smoke.c source/blender/makesrna/intern/rna_space.c
2016-08-06Basic Alembic supportKévin Dietrich
All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-04Cleanup: Use BKE_gpencil prefixJulian Eisel
This is a good point to change this as grease-pencil-v2 branch was just merged, so I hope merge conflicts with other branches are minimal.
2016-08-04Grease Pencil v2 BranchAntonio Vazquez
Improve current Grease Pencil in order to get a better 2D animation tool. More info in WIKI pages: https://wiki.blender.org/index.php/User:Antoniov Reviewed By: Severin, aligorith, campbellbarton Patch by @antoniov, with edits by @Severin. Differential Revision: https://developer.blender.org/D2115