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
2013-10-14Merged revisions 60248-60717 from trunk/blendersoc-2013-bgeDaniel Stokes
2013-10-12code cleanup: use const's for vector args.Campbell Barton
2013-09-21Merged revision(s) 59972-60247 from trunk/blenderDaniel Stokes
2013-09-17Fix #36718: Wrong lighting on text objectsSergey Sharybin
In fact, all curve objects were flipped in GLSL mode. This is because of the way how normals are calculated for them (inwards vs. outwards). We might want to make normals consistent all over, but that would be the bigger change. For ow just made some tweaks to OpenGL setup. Thanks Brecht for the review and tests!
2013-09-14Simplifying the usage of BKE_object_lod_meshob_get and ↵Daniel Stokes
BKE_object_lod_matob_get, and cleaning up the code lod code in object.c. The level of detail data now uses a bitfield for flags such as use_mesh and use_mat. The few files out there currently using levels of detail will need to renable those options.
2013-09-14Renaming BKE_object_lod_check to BKE_object_lod_is_usable to make what is ↵Daniel Stokes
being checked more clear.
2013-09-10Merged revisions 58706-59971 from trunk/blenderDaniel Stokes
2013-09-10Fix #36356: faces not drawn with constructive modifier + dynamic paint, where itBrecht Van Lommel
overrides material colors with dynamic paint colors.
2013-09-09Enable vertex snapping to bundle positionsSergey Sharybin
This means it's possible now to snap stuff to reconstructed tracks positions.
2013-08-26Don't check for an object mode that is excluded as a prerequisite forAntony Riakiotakis
entering this branch of code.
2013-08-26Remove dirty normals assert from drawobject.cSergey Sharybin
Dirty normals already being checked in DerivedMesh.c, and this things really rather be localized in one single place than being checked all over the code.
2013-08-24Fix #36441: opengl render of smoke wrong after regular render with blender ↵Brecht Van Lommel
internal. Object.imat isn't always the inverse of Object.obmat, needs to be set before usage as mentioned in DNA_object_types.h. Thanks to Miika for tracking down the cause of this bug.
2013-08-21Partial revert of recenr cu->disp merge commitSergey Sharybin
That ended up in tricky code trying to mimic depsgraph branch behavior API-wise preserving texspace and bound box calculation compatible with previous releases. So for now bring cu->disp back to the trunk but keep texpsace and boundbox APIs the same as in the branch. This keeps texpsapce and boundbox behavior fully compatible with previous releases and still makes API the same as for meshes.
2013-08-21correct NULL pointer dereference with recent displist changes.Campbell Barton
2013-08-19Make lattice deform safe for threadingSergey Sharybin
Lattice deformation used to store some runtime data inside of lattice datablock itself. It's something which is REALLY bad. Ideally DNA shouldn't contain and runtime data. For now solved it in a way that initialization of lattice deform will create a structure which contains lattice object for which deformation is calculating and that runtime data which used to be stored in lattice datablock itself. It works really fine for mesh deform modifier, but there's still runtime data stored in particle system DNA, It didn't look something easy to be solved, so leaving this as-is for now. -- svn merge -r58277:58278 -r58795:58796 ^/branches/soc-2013-depsgraph_mt
2013-08-19Move bevel list and path from Curve to Object datablockSergey Sharybin
I know this is not so much nice to have this guys hanging around in a general Object datablock and ideally they better be wrapped around into a structure like DerivedMesh or something like this. But this is pure runtime only stuff and we could re-wrap them around later. Main purpose of this is making curves more thread safe, so no separate threads will ever start freeing the same path or the same bevel list. It also makes sense because path and bevel shall include deformation coming from modifiers which are applying on pre-tesselation point and different objects could have different set of modifiers. This used to be really confusing in the past and now data which depends on object is stored in an object, making things clear for understanding even. This doesn't make curve code fully thread-safe due to pre-tesselation modifiers still modifies actual nurbs and lock is still needed in makeDispListsCurveTypes, but this change makes usage of paths safe for threading. Once modifiers will stop modifying actual nurbs, curves will be fully safe for threading. Actually, this commit also contains wrapping runtime curve members into own structure This allows easier assignment on file loading, keeps curve- specific runtime data grouped and saves couple of bytes in Object for non-curve types. -- svn merge -r57938:57939 ^/branches/soc-2013-depsgraph_mt svn merge -r57957:57958^/branches/soc-2013-depsgraph_mt
2013-08-19Always use ob->bb when drawing the curve typesSergey Sharybin
It used to be a check for ob->bb ? ob->bb : cu->bb but in fact it doesn't make sense and only makes code more crappy. Making displist for mballs and curves/surfaces/fonts already ensures object has walid bounding box. -- svn merge -r57938:57939 ^/branches/soc-2013-depsgraph_mt
2013-08-11use 'greater/less then or equal to' operators rather then adding 1.Campbell Barton
2013-08-06quiet double-promotion warnings, change octree.cpp to use a float (vector ↵Campbell Barton
accumulated into a float anyway)
2013-08-04add missing NULL checks from BKE_constraint_get_typeinfo(), so constraints ↵Campbell Barton
from the future dont crash. also remove some redundant NULL checks.
2013-08-01Fix [#36265]: Smoke doesn't work if domain object has negative scale.Miika Hamalainen
2013-07-29Merged revisions 58516-58705 from trunk/blenderDaniel Stokes
2013-07-28move suspicious break statement in drawDispListsolid() to prevent falling ↵Campbell Barton
through.
2013-07-23Merged revisions 57983-58515 from trunk/blenderDaniel Stokes
2013-07-23optimization: only calculate the normals for passing into derivedMesh ↵Campbell Barton
foreachMappedVert/foreachMappedFaceCenter when needed, this means in editmode with wire draw, face and vertex normals don't have to be calculated at all. in most cases the normals are not used so add a flag that makes calculating them only for functions that need them. also fix face normal calculation for CDDM, was using quad calculation for ngons too.
2013-07-23hidden-wire draw option: always use the cage when masking out faces ↵Campbell Barton
otherwise modifiers give odd results.
2013-07-21fix for unintended fall-through in switch statement, also reduce undo_pos ↵Campbell Barton
increments in text editor.
2013-07-21code cleanup: add break statements in switch ()'s, (even at the last case).Campbell Barton
2013-07-20hidden wireframe option for mesh editmode, important for retopology mode ↵Campbell Barton
(can be used with xray).
2013-07-15fix for own regression, face index ranges still need checking in some places.Campbell Barton
2013-07-10draw loopcut display on the deformed mesh when in editmode.Campbell Barton
2013-07-09fix [#36055] Edge/Face Info display on wrong position with key framesCampbell Barton
display editmesh stats with deform modifiers.
2013-07-09Fix #36063: cycles 3D viewport was incorrectly influenced by blender internalBrecht Van Lommel
material halo settings.
2013-07-05Merged revisions 57870-57983 from trunk/blenderDaniel Stokes
2013-07-05fix for [#35911] wasn't complete, while weigths would show in editmode, ↵Campbell Barton
weights that were modified by a weight modifier wouldn't.
2013-07-01tweak to commit r57891, dont draw hidden faces/edges in editmode.Campbell Barton
2013-07-01fix [#35911] Show weights not working with a weight edit modifier in edit modeCampbell Barton
2013-06-29Merged revisions 57538-57869 from trunk/blenderDaniel Stokes
2013-06-26Fixing some crashes with the level of detail system with the default blendfile.Daniel Stokes
2013-06-26Material level of detail is now working. Material levels of detail appear in ↵Daniel Stokes
all editing modes (sculpt, edit, etc).
2013-06-26Basic mesh level of detail is now working in the viewport. It should only ↵Daniel Stokes
display levels of detail if you are in object mode, or the object is not the currently active object.
2013-06-25Fix #35767: transforming nodes in the node editor changed the wireframe colorBrecht Van Lommel
of the active object in the 3D view. This was due to sharing a global G.moving flag to indicate that transform is active, now it's only set per transform data type so different editors don't influence each other.
2013-06-24add api calls for BM_mesh_active_vert/edge_get.Campbell Barton
inspecting the edit-selection inline was cumbersome.
2013-06-23remove vec_rot_to_mat3(), replace with axis_angle_normalized_to_mat3()Campbell Barton
2013-06-20editmesh draw optimizations: use customdata offsets rather then per-element ↵Campbell Barton
lookups.
2013-06-20remove NULL checks for return values from EDBM_***_at_index calls.Campbell Barton
2013-06-15make active vertex more apparent in weight paint modeGaia Clary
2013-06-15display active vertex in weight paint mode. also correct NULL free.Campbell Barton
2013-06-14fix [#35694] Lattice; Display Type: "Bounds" not workingCampbell Barton
2013-06-11another case that should have been in r57371, also reduce type conversions ↵Campbell Barton
in compassion.