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-04-05Merge branch 'cycles_point_density' into gooseberryLukas Tönne
2015-04-05Fix for undefined psmd field in when evaluating particle textures.Lukas Tönne
2015-04-04Merge branch 'cycles_point_density' into gooseberryLukas Tönne
Conflicts: source/blender/blenkernel/intern/particle.c source/blender/editors/space_view3d/drawobject.c source/blender/makesdna/DNA_particle_types.h source/blender/makesdna/DNA_texture_types.h source/blender/makesrna/intern/rna_particle.c
2015-04-04Support for particle texture color in point density textures.Lukas Tönne
This works for all pointdensity use cases, BI as well as Cycles.
2015-04-04Particle color influence option for particle textures.Lukas Tönne
This color is currently only displayed in the viewport (when enabling "Texture" color mode in the Display settings). It will be used for controlling the smoke color when using particles for smoke emission. Conflicts: source/blender/blenkernel/intern/particle.c source/blender/editors/space_view3d/drawobject.c source/blender/makesdna/DNA_particle_types.h source/blender/makesdna/DNA_texture_types.h source/blender/makesrna/intern/rna_particle.c
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-03Merge branch 'alembic' into gooseberryLukas Tönne
Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp
2015-04-03Added the major parameters for the hair simulation.Lukas Tönne
This is basically copied from existing cloth sim settings, with a good deal of cleanup and sanitization. Unlike cloth parameters, the damping values are described as relative to their associated stiffness values for springs. This is much easier to use in practice and less prone to lead to unstable simulations. Damping simply works best when the force is in the same order of magnitude as the stiffness, so having a relative factor requires much less adjustment on the user side.
2015-04-03Added effector weights for cache hair simulation.Lukas Tönne
2015-04-03RNA for modifier struct subtypes.Lukas Tönne
Also renamed StrandSimParams to HairSimParams, since strands are only the agnostic data structure, while these parameters are specifically used to simulate hair-like behavior. Other simulations could use strands but implement completely different kinds of physics (e.g. grass, ropes).
2015-04-03Smaller strips not working for files with sequencerAntony Riakiotakis
2015-04-03"Structural" spring forces for strands.Lukas Tönne
These connect strand points to ensure constant length and form the main spring system in strand simulation. Note that parameters are still hardcoded.
2015-04-03Fix unfreed motion state memory when freeing strand data.Lukas Tönne
2015-04-03Scalp animation support: copy strand root locations from the rest poseLukas Tönne
before performing a time step.
2015-04-03Pinning for strand roots.Lukas Tönne
Note that roots are currently not animated.
2015-04-03Use FPS value to sync the strand simulation time with the render time.Lukas Tönne
Additionally the time can be scaled using the timescale parameter.
2015-04-03Correct progression handling of the strands motion state through cacheLukas Tönne
baking. For now this simply applies gravity and applies the basic hair solver for velocities and positions.
2015-04-02Make mattieu happy - allow smaller strips vertically.Antony Riakiotakis
Allows mattieu's masterplan to keep overdrop at higher sequencer space and all strips lower. This won't align text so well though, but will leave it simple and he can give feedback later.
2015-04-02Cycles point density: Fix using double semicolon at the end of lineSergey Sharybin
2015-04-02Fix for wrong pointer used in the modifier cache copy function.Lukas Tönne
2015-04-02Force calculation function for strands (only gravity atm).Lukas Tönne
2015-04-02Sanity check and nicer substep loop for strands simulation.Lukas Tönne
2015-04-02Fixed writing code for cache modifiers to include extra DNA fields ofLukas Tönne
subtypes.
2015-04-02Fixed DupliCache writers/readers to support subsequent stages ofLukas Tönne
cache manipulation. Strand data in caches is now stored in a named list, so we can avoid adding strand data in every frame.
2015-04-02Merge branch 'master' into gooseberryAntony Riakiotakis
2015-04-02Fix proportional editing always turned on in graph editor.Antony Riakiotakis
2015-04-02Merge branch 'master' into gooseberryCampbell Barton
2015-04-02Merge branch 'master' into alembicCampbell Barton
2015-04-02cleanup: warningCampbell Barton
2015-04-02Add custom properties to sequence stripsCampbell Barton
2015-04-02Cleanup own todo: RE_pipeline is not a bad include from BKE, it's already ↵Sergey Sharybin
used in few places
2015-04-02Disallow deleting of files by the point cache in the `clear` function.Lukas Tönne
This function is used in every part of the code, and has been causing great pain when deleting 15 hours worth of baking in an instant. The complexity of the code makes it unfeasible to fix this selectively, so for now simply disallow the code from deleting any of the files. For selected well-defined cases the deleting can be reenabled later, e.g. when the user presses the `Bake` button and confirms deletion in a popup.
2015-04-02Removed unused `BKE_ptcache_remove` function, one less potential placeLukas Tönne
where cache files might get deleted.
2015-04-02CleanupCampbell Barton
2015-04-02Code Cleanup: Pruning back the unusued includes nowJoshua Leung
2015-04-02Code Cleanup: Reshuffling some of the GPencil codeJoshua Leung
* Moved the context handling stuff into gpencil_utils.c * Moved the datablock and layer operators out into their own file too. Again, these weren't related to the other stuff that much * Split the GPencil to Curves operator out into its own file (gpencil_convert.c). This was quite a massive blob of code (48kb) that was not that related to the other operators still in that file (gpencil_edit.c)
2015-04-02Fix for incorrect descriptionJoshua Leung
2015-04-02Fix T44217: Crash when starting .blend without "Load UI" enabledJulian Eisel
Caused by changes in 31e26bb83b. This makes it fall back to the old method if we can't find a screen. Patch is actually by @LazyDodo with minor edits by me.
2015-04-01Clear duplilist instances when reading from a dupli cache, to avoidLukas Tönne
generating a new dupli instance on every frame.
2015-04-01Made the duplicache clear function public.Lukas Tönne
It's a common operation that may be useful later, no reason to keep this hidden.
2015-04-01Basic strand processing in the hair sim cache modifier.Lukas Tönne
2015-04-01Cycles: Make SSS intersection closer to regular triangle intersectionSergey Sharybin
2015-04-01Cycles: Remove unused direction from triangle intersection functionsSergey Sharybin
This argument was unused and got nicely optimized out. But once it starts to be using registers are getting stressed really crazy, causing slow down of render.
2015-04-01Revert "Always display full data paths in tooltips"Julian Eisel
Seems like there is currently now way to get the full data path reliably. So instead of the old "..." this patch just displays (null) which also isn't really useful.
2015-04-01Clean up vertex/normal client state after drawing strands.Lukas Tönne
This should hopefully prevent some random crashes.
2015-04-01Always display full data paths in tooltipsJulian Eisel
Another experiment for gooseberry. We should make Blender smarter here in general, but it's a start.
2015-04-01Reorganized RMB menu and new entry "Copy Full Data Path"Julian Eisel
D763 ready for testing from the sheepy people.
2015-04-01Merge branch 'alembic' into gooseberryLukas Tönne
2015-04-01Clean up: Avoid unused variable warnings.Lukas Tönne