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
path: root/source
AgeCommit message (Collapse)Author
2017-02-12Merge branch 'blender2.8' into transform-manipulatorsJulian Eisel
Conflicts: source/blender/editors/interface/resources.c source/blender/editors/space_view3d/view3d_intern.h source/blender/editors/transform/transform_manipulator.c source/blender/gpu/CMakeLists.txt source/blender/gpu/intern/gpu_shader.c
2017-02-12OpenGL: enable program point size for keyframesMike Erwin
Allows vertex shader to determine how large to rasterize each point sprite. Forgot to do this before.
2017-02-12OpenGL: convert NLA editor to new imm modeMike Erwin
Plus plenty of C99 cleanup. Part of T49043. Needs more testing, I don't really use the NLA editor.
2017-02-11GPU shaders / Clay engine : small renaming / cleanupClément Foucault
2017-02-11Clay Engine: fix instancing (again)Clément Foucault
2017-02-11Clay Engine: converted Empties to the new instancing methodClément Foucault
2017-02-11Clay Engine: Small instancing fixesClément Foucault
2017-02-11Clay Engine: Convert Lamp to use new instancing feature.Clément Foucault
2017-02-11Clay Engine: Fix instance attrib.Clément Foucault
2017-02-11Clay Engine: Separate batch for Z straight lineClément Foucault
2017-02-11Clay Engine: Refactoring of the dynamic batchesClément Foucault
Support more attribs for interesting instancing
2017-02-11OpenGL immediate mode: drawarmature.c (cont)Clément Foucault
Cube bone wire. Fix do_const_color. This breaks the selection in glSelect mode. Occlusion queries are fine.
2017-02-11OpenGL: updated clip_utils.c to new immediate modeMike Erwin
D2391 by @darwin, part of T49043 Reviewed by @merwin who made some small changes before committing.
2017-02-11fix warningMike Erwin
Strip start & end are floating-point values, so clang expected fabsf here. Casting to int since we want a discrete number of vertices.
2017-02-11OpenGL: draw keyframe markers as point spritesMike Erwin
Also some conversion to new imm mode (T49043). Multiple editors affected. We could push this even further & draw all keyframes in an editor with a single draw call. Something is strange with keyframe markers in blender2.8 -- they're not showing up before or after this commit. They do appear in master. This commit probably needs some follow-up work after keyframes are showing again. Better to share this code now instead of sitting on it.
2017-02-11add builtin GPU_SHADER_KEYFRAME_DIAMONDMike Erwin
Now we can draw keyframe markers as point sprites, with fewer draw calls and state changes. Based on the builtin shader for round points with anti-aliased outline. This one is more pointy.
2017-02-11Gawain: minor cleanupMike Erwin
2017-02-11OpenGL immediate mode: drawarmature.cClément Foucault
Changed the color function to output a float[4] to use with shaders. Temporary leaving the UI_ThemeColor/glColor function. Porting draw_bone_octahedral (wire) to Batch API.
2017-02-11Gawain : Added Batch_init()Clément Foucault
to init a batch without allocating memory
2017-02-11OpenGL immediate mode: interface_draw.c (cont)Clément Foucault
ui_draw_but_TRACKPREVIEW Changed stipple shader usage to a bunch of GL_LINES with flat color OpenGL immediate mode: interface_draw.c (end) Eradicate leftover legacy functions. Fix a crash with histogram resolution.
2017-02-11OpenGL immediate mode: Added replacement for glaDrawPixelsTex_*Clément Foucault
2017-02-11OpenGL immediate mode: interface_draw.c (cont)Clément Foucault
ui_draw_but_CURVE
2017-02-11cleanup from recent commitsMike Erwin
coding style, float literals Converted some (expr / literal) to (expr * literal) where it does not impact readability. Simplified a few function calls.
2017-02-11OpenGL immediate mode: clip_graph_draw.cLuca Rood
Part of T49043 and T49042
2017-02-11OpenGL immediate mode: gluSphere replacementClément Foucault
Updated interface_draw.c to use the new sphere batch.
2017-02-11OpenGL immediate mode: fix Waveform Font colorClément Foucault
2017-02-11OpenGL immediate mode: interface_draw.c (cont)Clément Foucault
ui_draw_but_COLORBAND Introduced a new checker shader to be used mostly on transparent areas. OpenGL immediate mode: interface_draw.c (cont) ui_draw_but_UNITVEC Introduced a new shader to be used for simple lighting.
2017-02-11OpenGL immediate mode: Convert leftover UI_ThemeColor callsLuca Rood
Some `UI_ThemeColor` calls were left in converted files, in some cases because they were just overlooked, and in the case of text drawing, because the new BLF color functions were not yet implemented at the time of conversion. Also converted one `drawcircball` call that was left in transform_constraints.c Part of T49043
2017-02-11fix clang warningMike Erwin
uninitialized variable (glGen functions set the value)
2017-02-11OpenGL immediate mode: uvedit_draw.cLuca Rood
Still has one `UI_ThemeColor` call, because drawing is happening in a DM drawing callback which hasn't been converted yet. Also has some old gl calls that are #ifdef'ed out. This also changes active face drawing in UVs from stippled to a solid color, which makes active faces much more visible, and also looks nicer. The same should probably be done for active face drawing in the 3d view. (has been discussed with merwin on IRC) Part of T49043
2017-02-10Use OBACT_NEW to show the object edit modeDalai Felinto
2017-02-10Complete immUniform functions to support 2float and 3floatAntonio Vazquez
2017-02-10Alembic: fixed mistake in bounding box computationSybren A. Stüvel
By performing the Z-up to Y-up conversion, the change in sign of the Z-coordinate swaps "minimum" and "maximum".
2017-02-10Alembic: using Base* instead of Object* to get selectionSybren A. Stüvel
I also added some remarks & TODOs to indicate work in progress.
2017-02-10Alembic: don't use parent_selected() to determine which object to exportSybren A. Stüvel
The parent_selected() function mixed semantics of "needs to be exported" and "is selected", which is confusing. Now just selected objects are exported to Alembic; any parent transforms that are required were already taken care of by other code.
2017-02-10Cleanup: Use const for array argumentJulian Eisel
2017-02-10Remove most (maybe all?) remaining yellow textJulian Eisel
Decided to request the text color as argument for UI_fonstyle_draw functions, rather than keeping it being another state to keep track of.
2017-02-09Fix missing highlights in 3D ViewJulian Eisel
Things like selection outlines didn't work at all. Caused by rBc973e8d2da5cf3f. When splitting up bitflags, the equivalent to `foo->flag & (bar1 + bar2)` is `(foo->flag1 & bar1) || (foo->flag2 & bar2)`, *not* `(foo->flag1 & bar1) && (foo->flag2 & bar2)`. Also, let's please avoid using '+' operator for bitwise operations, a binary addition is a binary OR *with* cary, which can cause quite some damage.
2017-02-09Fix object selection in 3D ViewJulian Eisel
2017-02-09Support activating collections from outlinerJulian Eisel
2017-02-09Main fix for outliner, but still need changesDalai Felinto
Fix outliner related crashes. Basically in some functions bContext was not passed around, so CTX_data_scene_layer(C) was crashing. Right now we still rely on ob->flag SELECT in some places. In order to use the base flag we will need to bring back the Bases to the outliner.
2017-02-09Support displaying collections in outlinerJulian Eisel
Adds a new outliner display mode "Collections" which draws the active collection. We might want to rename it to "Active Collection" if we don't plan to support showing other collections there. Also added the buttons for restricting visibility and selectability. @dfelinto, code in restrictbutton_collection_hide_cb and restrictbutton_collection_hide_select_cb is duplicated from rna_LayerCollection_hide_update and rna_LayerCollection_hide_select_update, maybe utility functions would be handy for this?
2017-02-09Depsgraph fix for scene layersDalai Felinto
Objects can be moved around freely now
2017-02-09More housecleaning (BASACT > BASACT_NEW)Dalai Felinto
2017-02-09Layers: set active object in doversion for all render layersDalai Felinto
2017-02-09Update get_camera_with_movieclipDalai Felinto
2017-02-09Change ITER_BEGIN to work in C++ (include object type in the macro)Dalai Felinto
2017-02-09Fix widget not showing upDalai Felinto
(and more Scene.base > SceneLayer.object_bases changes in transforma code)
2017-02-09Temporary fix for object panelDalai Felinto
2017-02-09Fix logic in CollectionEngineSetting updateDalai Felinto
Now Clay engine can show different materials per collection o/