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-05-24Remove TexFace, per-face imagesCampbell Barton
TexFace complicates the now more popular shading pipeline by having per-face images, see: T51382 for details. To keep the ability to select a per-material edit-image (used with UV-mapping workflow), the material now stores an image which will be set when changing images in edit-mode. This is used as a bake-target when not using Cycles too.
2017-05-22Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenloader/intern/versioning_270.c
2017-05-22Enhance vgroup handling when merging meshes.Bastien Montagne
We were looping over all vgroups in destination mesh and making string comparison, for every vgroup of every vertex of merged mesh! Crazy! Now we simply create a temp mapping of vgroup indices, seriously simplifies things (and gives significant speedup when merging huge meshes with lots of vgroups, here with quick stupid test went from 120ms in vgroup merging to less than 5ms, 25 times quicker!).
2017-05-04Vertex paint with draw managerLuca Rood
Reviewers: fclem Subscribers: campbellbarton, dfelinto Differential Revision: https://developer.blender.org/D2658
2017-05-03Weight painting with draw managerLuca Rood
This implements weight rendering with the draw manager, with all drawing options (Shading, wire, face masking, vertex masking). This is part of T51208 Reviewers: campbellbarton Subscribers: dfelinto Differential Revision: https://developer.blender.org/D2654
2017-04-25Merge branch 'master' into blender2.8Sybren A. Stüvel
2017-04-24Cleanup: remove unnecessary texface checksCampbell Barton
2017-04-15GPU Matrix API: clean up after 2D-3D unificationMike Erwin
See GPU_matrix.h & gpu_matrix.c for the important changes. Other files are mostly just updated to use the latest API. - remove unused functions, defines, enums, comments - remove "3D" from function names - init to Identity transform (otherwise empty stack) - gpuMatrixReset lets outside code return to initial state Part of T49450 Follow up to D2626 and 49fc9cff3b90
2017-04-13Merge branch 'master' into blender2.8Alexander Romanov
2017-04-12Fix T51184: Crash of Blender when I try to join an object with one that has ↵Sergey Sharybin
booleans modifiers
2017-04-11Bring snapping back (Base / BaseLegacy)Dalai Felinto
2017-04-07OpenGL: use PRIM instead of GL enum for immBeginMike Erwin
Getting ready for a Gawain API change... Part of T49043
2017-04-06Gawain: VertexFormat_add_attrib (function name change)Mike Erwin
See intern/gawain for the API change. Other files are updated to use the new name. Also updated every call site to the recommended style: unsigned int foo = VertexFormat_add_attrib(format, "foo", COMP_ ... )
2017-04-05Cleanup: Move imm_draw utils into own fileCampbell Barton
These were in BIF_glutil which is documented to be removed, so best not define new API's there.
2017-03-23cleanup use of GPU matrix APIMike Erwin
Take advantage of 2D functions, rotation about the X Y or Z axis, uniform scale factors. We no longer need to call gpuMatrixBegin_legacy() before using the new API locally in functions. related to T49450
2017-03-22OpenGL: convert to new matrix API (part 5)Mike Erwin
Pretty sure source/blender is now finished, with all legacy matrix calls confined to gpu_matrix.c. This was the easy part, but doing it first makes the next part much easier. TODO and XXX notes describe what is left. glMatrixMode is still in place, since the new API does not share this concept of modes. Similar for glOrtho and glFrustum which I'll tackle very soon. Part of T49450
2017-03-12Merge branch 'master' into blender2.8Campbell Barton
2017-03-12BMesh: rename cryptic functionsCampbell Barton
Use expanded names for bmesh primitive operations (urmv jvke semv jfke). Use 'bmesh_kernel_' prefix, these functions aren't intended for wide use so favor readability. Remove BM_face_vert_separate, it wasn't used and only skipped step of finding correct loop of face.
2017-03-11Merge branch 'master' into blender2.8Campbell Barton
2017-03-11BMesh: add BM_mesh_separate_facesCampbell Barton
Fast-path for bmesh split operator which duplicates and deletes. Use when only separating faces, currently used by the intersect tool.
2017-03-06Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_nla/nla_draw.c source/blender/editors/space_view3d/view3d_draw.c
2017-03-05BMesh: Add 'cut' separate mode for intersect toolCampbell Barton
It was only possible to separate all geometry from an intersection or none. Made this into an enum with a 3rd option to 'Cut', (now default) which keeps each side of the intersection separate without splitting faces in half.
2017-03-05Fix T50855: Intersect (knife) w/o separate doesn't selectCampbell Barton
2017-02-26OpenGL: replace gluProject and gluUnProject, and simplify surrounding code.Brecht Van Lommel
Part of T49042.
2017-02-08Merge branch 'master' into blender2.8Sybren A. Stüvel
# Conflicts: # source/blender/blenloader/intern/writefile.c
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-04Remove flag: `SNAP_OBJECT_USE_CACHE` from snap_contextGermano Cavalcante
Since the cache is created in one way or another, this flag is not really making a difference More details here: D2496
2017-02-02Merge branch 'master' into blender2.8Bastien Montagne
2017-02-02Fix T50084: Adding torus re-orders UV layers.Bastien Montagne
Issue was indeed in join operation, mesh in which we join all others could be re-added to final data after others, leading to undesired re-ordering of CD layers, and existing vertices etc. being shifted away from their original indices, etc. All kind of more or less bad and undesired changes, fixed by always re-inserting destination mesh first. Also cleaned up a bit that code, it was doing some rather non-recommanded things (like allocating zero-sized mem, doing own coocking to remove a data-block from main, etc.).
2017-02-01OpenGL immediate mode: editmesh_knife.cLuca Rood
Differential Revision: https://developer.blender.org/D2481 Part of T49043
2017-02-01OpenGL: use new matrix API for Loop CutMike Erwin
Follow-up to rB85174329d9f5 Part of T49450
2017-01-31blender 2.8: OpenGL immediate mode: editmesh_loopcut.cMike Erwin
Reviewers: merwin Reviewed By: merwin Subscribers: dfelinto Tags: #bf_blender_2.8 Maniphest Tasks: T49043 Differential Revision: https://developer.blender.org/D2480
2017-01-19Fix face-creation with existing hidden geometryCampbell Barton
- face-create-extend option could add hidden verts and edges into the selection history (invalid state). - faces could be created that included existing hidden edges that remained hidden (invalid state too). - newly created faces could copy hidden flag from surrounding faces, giving very confusing results (looks as if face creation failed). Surprising nobody noticed these years old bugs!
2016-12-13Fix strict warnings on WindowsSergey Sharybin
2016-12-08Fix T49872: 3D cursor places with camera shift in ortographic modeJulian Eisel
2016-11-25Math Lib: rotate matrix cleanupCampbell Barton
- Remove 'rotate_m2', unlike 'rotate_m4' it created a new matrix duplicating 'angle_to_mat2' - now used instead. (better avoid matching functions having different behavior). - Add 'axis_angle_to_mat4_single', convenience wrapper for 'axis_angle_to_mat3_single'. - Replace 'unit_m4(), rotate_m4()' with a single call to 'axis_angle_to_mat4_single'.
2016-11-14BMesh: fix edge-rotation selection state bugCampbell Barton
Failed edge rotation could leave unselected edge between selected faces, also report warning when edges fail to be rotated.
2016-11-13BMesh: BM_face_exists no longer uses return argCampbell Barton
Just return the face or NULL, like BM_edge_exists(), Also for BM_face_exists_overlap & bm_face_exists_tri_from_loop_vert. No functional changes. Old code did some partial overlap checks where this made some sense, but it's since been removed.
2016-10-26Cleanup: rename functions in BLI_bitmap_draw_2dCampbell Barton
2016-10-26Cleanup: move bitmap drawing into its own moduleCampbell Barton
Bitmap drawing is out-of-scope for a general math API, move to BLI_bitmap_draw_2d.
2016-09-24Mesh: added default UVs for Monkey, improved UVs for UV Sphere and Icosphere.Peter Lu
Fixes T47488 and T47478. Reviewed By: brecht Differential Revision: https://developer.blender.org/D2224
2016-09-03Fix T49228: Separate by material, materials dissappear after reload.Bastien Montagne
Yet another mismatch where code would decrease usercount (of Material here) but never increase it again when re-assigning the datablock...
2016-08-29Fix for Bevel segments bug T49183; but doesn't fix whole report yet.Howard Trickey
2016-08-18Cleanup: some bad sizeof() usages.Bastien Montagne
2016-08-12Depsgraph: tag relations for update when aterial slots changesSergey Sharybin
New dependency graph puts materials to the graph in order to deal with animation assigned to them and things like that. This leads us to a requirement to update relations when slots changes. This fixes: T49075 Assignment of a keyframed material using the frame_change_pre handler doesn't update the keyframe using the new dependency graph
2016-07-22remove double-checked conditionsMike Erwin
Checking a condition right after we’ve checked it (and it hasn’t changed). Most of these are trivial to understand. split_quads in convertblender.c: It seems quads should be processed and triangles should be marked as not needing split. So I removed the outer vlr->v4 check. Found with PVS-Studio T48917
2016-07-21Cleanup: warningsCampbell Barton
2016-07-16Cleanup: spellingCampbell Barton
2016-07-10Cleanup/Refactor: pass Main pointer to all ID copy functions.Bastien Montagne
Also allows us to get rid of a few _copy_ex() versions...
2016-07-09Add BKE_key_copy_ex() that takes a Main as parameter.Bastien Montagne