| Age | Commit message (Collapse) | Author |
|---|
|
I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.
Conflicts:
CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_select.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/gpu/intern/gpu_select.c
source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
source/blender/nodes/CMakeLists.txt
|
|
Based on patch by randon (Dun Liang), but no need to recompute lengths here, we already have the info.
|
|
|
|
by kevindietrich
|
|
|
|
GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO
Only set the blend func if the coefficients are different. Return them to the defaults when done.
Note: Fairly confident that Blender and the standalone Cycles renderer are correct, but that both the embedded and standalone game engine will need more testing.
Note: Do we actually want the default to be: GL_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA?
|
|
Conflicts:
CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp
|
|
|
|
Documentation to appear here:
http://wiki.blender.org/index.php/User:Jwilkins/VFX/GHOST_Refactor_for_EGL
Missing from this commit is support for systems other than Windows.
This also only builds with CMake.
|
|
Issue was caused by _wstat returning EOVERFLOW error because
of file size didn't fit into stat structure which was using
long datatype.
The idea of this patch is to use _wstat64 and _stat64 structure
which is capable storing 64bit file sizes.
Made it a typedef for stat structure used by BLI_stat function
in order to make code easier to follow and avoid ifdefs all
over the place.
Additionally solved issue with BLI_exists which was wrongly
returning False in cases destination file is larger then 4GB.
|
|
|
|
Opted to keep includes if they are used indirectly (even if removing is possible).
|
|
also fix bug where text saving would strip last newline
|
|
|
|
|
|
|
|
|
|
|
|
This can freeze Blender if you accidentally press ctrl+m on a large
script, conversion from text to 3d objects is fairly special case,
restricting access to the menu only.
|
|
|
|
Patch by chipgw.
|
|
|
|
|
|
|
|
|
|
exposes many incorrect and redundant stubs
|
|
|
|
Previously this only worked for some datablocks relevant to rendering, now it
can be used to detect if any type of datablock was added or removed (but not
yet to detect if it was modified, we need many more depsgraph tags for that).
Most of the changes are some function parameter changes, the important parts
are the DAG_id_type_tag calls.
Reviewed By: sergey, brecht
Differential Revision: https://developer.blender.org/D195
|
|
|
|
The trackpad would give isolated mouse pan events with a distance smaller than
one line or character. For other 2D views this is all accumulated in floats,
but in the text editor it only keeps track of integers, and the small mouse pan
events got lost due to rounding.
Now it keeps track of sub-line or sub-character scroll offsets to avoid this.
|
|
There is a bunch of internal refactoring going on too:
* No longer use operators to handle these directory and file fields, only makes
things more complicated than they should be.
* Handle autocomplete partial/full match deeper in the UI code
* Directory field still does not keep focus, that's for another time to fix,
you can already do pretty quick keyboard only navigation with the file field.
Reviewed By: elubie
Differential Revision: http://developer.blender.org/D29
|
|
OPERATOR_CANCELLED.
|
|
|
|
|
|
in Text Generic
|
|
Seems no user counter tricks are needed from r23598.
Also, r33453 is obviously wrong, because new ID's user counter is 1,
and could not exceed this value.
|
|
but not Numpad Enter
|
|
|
|
update some descriptions, others were removed and operators tagged as internal.
add a script to detect duplicate operator descriptions.
|
|
(added Ctrl+P as a toggle to show Properties)
|
|
|
|
When tabs to spaces is enabled and a paste command is undone, the improper number of characters could get removed. Also fixed issue with shift + left/right only selecting a max of 1 character.
|
|
jumps to either side of the selection previously the cursor would move and loose the selection too.
text button fields already did this.
|
|
characters could draw outside the selection when the text was scaled up.
|
|
|
|
which is needed after splitting).
|
|
(would flicker on scroll).
|
|
|
|
paste errors), also remove BKE_script.h
|
|
characters on Windows.
Replaced some uses of stat() by BLI_stat() to properly handle such filepaths.
|
