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-06Base refactor 4/4Dalai Felinto
Rebase ObjectBase > Base
2017-02-06Base refactor 3/4Dalai Felinto
Rename Base > BaseLegacy Note manual changes on: * deg_builder_nodes.h * rna_object.c * KX_Light.cpp Rna is still using Base directly for the ObjectBaseLegacy rna object. Depsgraph change will be removed later.
2017-02-06Base refactor 1/4Dalai Felinto
Rename Base.flag > Base.flag_legacy
2017-02-03Get rid of runtime data struct.Clément Foucault
2017-01-30Fixed unfreed memoryClément Foucault
2017-01-29Change in DNA/RNA. Still missing freeing and read/write.Clément Foucault
2017-01-27Merge remote-tracking branch 'origin/render-layers' into clay-engineDalai Felinto
2017-01-26Merge remote-tracking branch 'origin/blender2.8' into render-layersDalai Felinto
Note: renamed blo_do_versions_after_linking_280 to do_versions_after_linking_280 to following the pattern of do_versions_after_linking_270
2017-01-26Merge branch 'master' into blender2.8Sergey Sharybin
2017-01-26Fix unfreed memory after cleaning render layersDalai Felinto
The freestyle data was never freed when removing a renderlayer. ``` blender -b --factory-startup --debug-memory --python-expr "import bpy;bpy.ops.scene.render_layer_add();bpy.context.scene.render.layers.active_index=0;bpy.ops.scene.render_layer_remove()" ```
2017-01-25Merge branch 'render-layers' of git.blender.org:blender into clay-engineClément Foucault
# Conflicts: # source/blender/editors/space_view3d/drawobject.c
2017-01-25Merge remote-tracking branch 'origin/blender2.8' into render-layersDalai Felinto
2017-01-24Depsgraph: Remove legacy calls from scene update routinesSergey Sharybin
2017-01-23Clay Material work.Clément Foucault
2017-01-23Merge remote-tracking branch 'origin/blender2.8' into render-layersDalai Felinto
2017-01-20Removed Batch storageClément Foucault
Also lots of renaming Small visual tweaks Material Settings Struct is now shared by Scene and material
2017-01-19Handle main object dupli functionsDalai Felinto
Missing: mesh separation, material split, mesh conversion (curve to mesh)
2017-01-18Merge remote-tracking branch 'origin/blender2.8' into render-layersDalai Felinto
Manual fix: collection.c layer.c
2017-01-18GP Interpolate Sequence: Tool settings for controlling the shape of ↵Joshua Leung
interpolation This commit introduces the ability to use the Robert Penner easing equations or a Custom Curve to control the way that the "Interpolate Sequence" operator interpolates between keyframes. Previously, it was only possible to get linear interpolation between the gp frames. Workflow: 1) Place current frame between a pair of GP keyframes 2) Open the "Interpolate" panel in the Toolshelf 3) Choose the interpolation type (under "Sequence Options") 4) Adjust settings (e.g. if you're using "Custom Curve", use the curvemap widget to define the way that the interpolation proceeds) 5) Click "Sequence" to interpolate 6) Play back/scrub the animation to see if you've got the result you want 7) If you need to make some tweaks, undo, or delete the generated keyframes, then repeat the process again from step 4 until you've got the desired result.
2017-01-17Remove OB_FROMGROUP from base, and add util funcs to sync base/object flagsDalai Felinto
I still want to remove the syncing of base/object flags. But for now this will at least help future refactor.
2017-01-16Cleanup/refactor: Add new BLI_string_util.Bastien Montagne
Things like `BLI_uniquename` had nothing, but really nothing to do in BLI_path_util files! Also, got rid of length limitation in `BLI_uniquename_cb`, we can use alloca here to avoid overhead of malloc while keeping free size (within reasonable limits of course).
2017-01-11Merge remote-tracking branch 'origin/render-layers' into clay-engineClément Foucault
# Conflicts: # source/blender/editors/space_view3d/drawobject.c # source/blender/gpu/intern/gpu_viewport.c
2017-01-10rename ob_base > base, it will simplify further refactorsDalai Felinto
2017-01-09Add properties to clay material (not exposed yet)Clément Foucault
2017-01-04Merge remote-tracking branch 'origin/blender2.8' into render-layersDalai Felinto
2017-01-04remove objects from collections when ED_base_object_free_and_unlinkDalai Felinto
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-16From review: move nodetree syncing of layers to util functionDalai Felinto
2016-12-13Merge remote-tracking branch 'origin/blender2.8' into render-layersDalai Felinto
plus manual rna fixup
2016-12-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-12-12Cleanup: Get rid of ntreeSwitchID(_ex) functions, use generic ↵Bastien Montagne
BKE_libblock_relink_ex instead.
2016-12-12Scene copy (full or link) working for layersDalai Felinto
I'm using the flags in the objects instead of bases.
2016-12-06Fix new scenes should have a default renderlayerDalai Felinto
2016-12-06Fix all unfreed memoryDalai Felinto
2016-12-05Use pointer for master collectionDalai Felinto
This allows this pointer to be used, otherwise the pointer is not written
2016-12-01Merge branch 'master' into blender2.8Lukas Tönne
2016-11-30Cleanup id->newid usage, initial work.Bastien Montagne
This aims at always ensuring that ID.newid (and relevant LIB_TAG_NEW) stay in clean (i.e. cleared) state by default. To achieve this, instead of clearing after all id copy call (would be horribly noisy, and bad for performances), we try to completely remove the setting of id->newid by default when copying a new ID. This implies that areas actually needing that info (mainly, object editing area (make single user...) and make local area) have to ensure they set it themselves as needed. This is far from simple change, many complex code paths to consider, so will need some serious testing. :/
2016-10-13Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-11Make console message more clear for --scene argumentSergey Sharybin
2016-09-26Merge branch 'master' into blender2.8Bastien Montagne
WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff. Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway). Conflicts: release/scripts/startup/bl_ui/properties_particle.py source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/smoke.c source/blender/editors/physics/particle_object.c source/blender/editors/physics/physics_intern.h source/blender/editors/physics/physics_ops.c source/blender/editors/space_outliner/outliner_intern.h source/blender/editors/space_view3d/drawvolume.c source/blender/makesrna/intern/rna_smoke.c
2016-09-26Fix Scene datablocks being created with a real user while never having any ↵Bastien Montagne
real datablock user. Now using new system dedicated to that kind of cases, id_ensure_real_user(), instead. That way, usercount of Scenes is handled correctly at deletion time. Reported by @sergey over IRC, thanks.
2016-09-04Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_particles.cpp source/blender/blenkernel/intern/particle.c source/blender/gpu/intern/gpu_shader.c
2016-08-26Depsgraph: Report overall number of updates objectsSergey Sharybin
2016-08-26Cleanup: Use more meaningful names and move calculation into am if statementSergey Sharybin
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-19Cleanup: Remove redundant commentJulian Eisel
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