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-30Merge branch 'master' into depsgraph_refactorSergey Sharybin
Conflicts: source/blender/blenkernel/intern/armature.c
2015-04-20Cleanup: use bool /w flag checksCampbell Barton
2015-03-16Depsgraph: Pass bmain to the new modifier updateDepsgraph callbackSergey Sharybin
This is complementary change to what we did in master in order to deal with simulation modifiers.
2015-03-16Merge branch 'master' into depsgraph_refactorSergey Sharybin
Conflicts: CMakeLists.txt build_files/scons/tools/btools.py intern/cycles/util/util_types.h source/blender/editors/object/object_constraint.c
2015-03-13Pass proper bmain to the updateDepgraph() of modifiersSergey Sharybin
This is mainly to make physics modifiers being able to work with it. For other cases this main is not needed.
2015-01-02Depsgraph: Fill in missing updateDepsgraph() callbacks for modifiersSergey Sharybin
Doesn't mean it's 100% working, but preliminary checks for most of the modifiers seems to be fine. More intense testing is needed tho.
2014-12-05Merge branch 'master' into depsgraph_refactorSergey Sharybin
2014-11-29Cleanup: unused headersCampbell Barton
2014-05-07Merge branch 'master' into depsgraph_refactorLukas Tönne
Conflicts: source/blender/makesrna/intern/rna_scene.c
2014-04-30Code cleanup: remove unused includesCampbell Barton
Opted to keep includes if they are used indirectly (even if removing is possible).
2014-04-13Merge branch 'master' into depsgraph_refactorLukas Tönne
2014-04-04Code cleanup: no need to use calloc when memory is initialized afterCampbell Barton
also replace AT with __func__ since AT expands the full pathname
2014-03-21Basic callback in ModifierTypeInfo for registering dependencies in theLukas Tönne
new depsgraph. For now this lives alongside the old callback until porting is complete and the old callback can be removed. The modifier cb uses a DepsNodeHandle symbolic type for representing the current modifier node itself, so it doesn't get into conflict with the actual DepsNode class. This will also incorporate a pointer to Depsgraph and possibly other state info internally, so only a single handle argument is needed.
2013-12-21Mesh Modifiers: refactor copying using a generic functionCampbell Barton
2013-09-18UVProject modifier was still requiring old tesselated UV data instead of new ↵Bastien Montagne
poly/loop ones.
2013-05-26BLI_math rename functions:Campbell Barton
- mult_m4_m4m4 -> mul_m4_m4m4 - mult_m3_m3m4 -> mul_m3_m3m4 these temporary names were used to avoid problems when argument order was switched.
2013-05-08add matrix multiply for projection that outputs 2d values.Campbell Barton
2013-05-02Fix #35174: dynamic paint displacement missing in render.Brecht Van Lommel
A previous bugfix disabled the dynamic paint modifier for orco texture coordinate evaluation of the modifier stack. However the MOD_APPLY_USECACHE flag is not a good way to check if the modifier is evaluated for orcos. Instead I've added a MOD_APPLY_ORCO flag. Also removed a bunch of applyModifierEM callbacks, none of them served a purpose except for the subsurf modifier.
2012-09-22replace UV project modifier matrix calculation with BKE_camera_params_* ↵Campbell Barton
functions, double checled combinations of aspect/scale/shift work as before --- but this reduces the likelyhood of discrepancies for sensor size (corner cases).
2012-05-09Refactor of modifiers' apply function: now use a single bit-flag parameter ↵Bastien Montagne
to pass options, instead of having one parameter per boolean flag (i.e. replaces current useRenderParams and isFinalCalc by a single ModifierApplyFlag flag. ModifierApplyFlag is an enum defined in BKE_modifier.h). This way we won't anymore have to edit all modifier files when e.g. adding a new control flag! Should have no effect over modifier behavior.
2012-05-06style cleanup: modifiersCampbell Barton
2012-05-06code cleanup: naming - BKE_mesh_*Campbell Barton
2012-05-05code cleanup: brush/camera namingCampbell Barton
2012-05-05code cleanup: function naming for BLI functions.Campbell Barton
2012-05-04Fisheye Camera for CyclesDalai Felinto
For sample images see: http://www.dalaifelinto.com/?p=399 (equisolid) http://www.dalaifelinto.com/?p=389 (equidistant) The 'use_panorama' option is now part of a new Camera type: 'Panorama'. Created two other panorama cameras: - Equisolid: most of lens in the market simulate this lens - e.g. Nikon, Canon, ...) this works as a real lens up to an extent. The final result takes the sensor dimensions into account also. .:. to simulate a Nikon DX2S with a 10.5mm lens do: sensor: 23.7 x 15.7 fisheye lens: 10.5 fisheye fov: 180 render dimensions: 4288 x 2848 - Equidistant: this is not a real lens model. Although the old equidistant lens simulate this lens. The result is always as a circular fisheye that takes the whole sensor (in other words, it doesn't take the sensor into consideration). This is perfect for fulldomes ;) For the UI we have 10 to 360 as soft values and 10 to 3600 as hard values (because we can). Reference material: http://www.hdrlabs.com/tutorials/downloads_files/HDRI%20for%20CGI.pdf http://www.bobatkins.com/photography/technical/field_of_view.html Note, this is not a real simulation of the light path through the lens. The ideal solution would be this: https://graphics.stanford.edu/wikis/cs348b-11/Assignment3 http://www.graphics.stanford.edu/papers/camera/ Thanks Brecht for the fix, suggestions and code review. Kudos for the dome community for keeping me stimulated on the topic since 2009 ;) Patch partly implemented during lab time at VisGraf, IMPA - Rio de Janeiro.
2012-04-29style cleanup: function calls & whitespace.Campbell Barton
2012-04-29style cleanup: whitespace / commasCampbell Barton
2012-03-24style cleanup: follow style guide for/with/if spacingCampbell Barton
2012-03-24style cleanup: follow style guide for formatting of if/for/while loops, and ↵Campbell Barton
else if's
2012-03-19Fix [#30234] Various problems with CD layers and tesselation, related to ↵Bastien Montagne
modifiers stack. Should also fix [#30266], [#29451], and partly [#30316]. Here are the changes made by this commit: * It adds a "dirty" flag to DerivedMesh struct (for now, only DM_DIRTY_TESS_CDLAYERS, but more might be added as needed). * It adds a new func, DM_update_tessface_data, which assumes tessfaces themselves are valid, but updates tessellated customdata from their poly/loop counter parts. * At end of modstack, when valid tessellated faces are present in finaldm , but the cdlayers dirty flag is set, call that function (instead of recomputing the whole tessellation). * Edits to the codes concerned (UVProject, DynamicPaint, and Subsurf modifiers). * Also add to subsurf dm generation code the creation of a CD_POLYINDEX layer (mandatory for DM_update_tessface_data to work well, and imho all tessellated dm should have one). Note: some pieces of old code are just #if 0’ed, will clean them later.
2012-03-09style cleanup: comment blocksCampbell Barton
2012-02-27style cleanup (mostly whitespace)Campbell Barton
2012-02-24Fixed crash in UV project modifier.Sergey Sharybin
2012-01-20quiet some warningsCampbell Barton
2012-01-11svn merge ^/trunk/blender -r43278:43294Campbell Barton
2012-01-11Longer names support for all ID and other object namesSergey Sharybin
This commit extends limit of ID and objects to 64 (it means 63 meaning characters and 1 for zero-terminator). CustomData layers names are also extended. Changed DNA structures and all places where length constants were hardcoded. All names which are "generating" from ID block should be limited by MAX_ID_NAME-2, all non-id names now has got own define called MAX_NAME which should be used all over for non-id names to make further name migration stuff easier. All name fields in DNA now have comment with constant which corresponds to hardcoded numeric value which should make it easier to further update this limits or even switch to non-hardcoded values in DNA. Special thanks to Campbell who helped figuring out some issues and helped a lot in finding all cases where hardcoded valued were still used in code. Both of forwards and backwards compatibility is stored with blender versions newer than January 5, 2011. Older versions had issue with placing null-terminator to DNA strings on file load which will lead to some unpredictable behavior or even crashes.
2012-01-04update UV project modifier to use MLoopUV's rather then tessface UV'sCampbell Barton
2012-01-04svn merge ^/trunk/blender -r43092:43092Campbell Barton
2012-01-04edits to UV project modifier which make it easier to sync with bmesh.Campbell Barton
2011-12-21svn merge ^/trunk/blender -r42761:42776Campbell Barton
2011-12-21svn merge ^/trunk/blender -r42759:42761Campbell Barton
2011-12-20New modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting ↵Bastien Montagne
CustomData layers only (e.g. UVProject and WeightVG ones). Also, allow applying to obdata those modifiers, even with shapekeys, but do not allow applying them *as* shapekey (as shapekeys do not have CD layers). Fix [#29636] Vertex Weight Mix modifier "apply" button don't work. Note: applying whit shape keys currently always uses base shape, not current one (for apply to obdata as well as apply to shapekey), but this is another topic...
2011-12-20Fix a small typo-bug in UVProject modifier (using v3 instead of v4 to detect ↵Bastien Montagne
tri/quad faces). Seems it was harmless, though...
2011-12-19svn merge ^/trunk/blender -r42680:42722Campbell Barton
2011-12-19Fix a bug in CustomData_duplicate_referenced_layer(_named) functions: ↵Bastien Montagne
MEM_dupallocN does not work with complex layers like CD_MDEFORMVERT ones, so rather use copy func when available.
2011-12-17use 2d copy functions with UV's in more places.Campbell Barton
2011-12-17svn merge ^/trunk/blender -r42669:42670Campbell Barton
2011-12-16Math lib: matrix multiplication order fix for two functions that wereBrecht Van Lommel
inconsistent with similar functions & math notation: mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B) mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B) For branch maintainers, it should be relatively simple to fix things manually, it's also possible run this script after merging to do automatic replacement: http://www.pasteall.org/27459/python
2011-11-24svn merge ^/trunk/blender -r42095:42116Campbell Barton
2011-11-23Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,Brecht Van Lommel
by Gaia Clary. Rationale: the name was confusing and not always used consistently, and this map itself is not something that can be layered, rather the map can be used as texture coordinates in some layered setup. The original intent was to indicate this contained more than just UV's, but the game engine settings have already been moved out, and apparently users didn't really get this from the name anyway.