griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
bb8a172dfbe1c4ea405f78bd54b07501ff59b98f
test2/source/blender/editors
History
Julian Eisel a99495d291 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/scene.c
2017-03-02 19:15:32 +01:00
..
animation
Remove tons of OBACT
2017-03-02 17:09:24 +01:00
armature
Remove tons of OBACT
2017-03-02 17:09:24 +01:00
curve
OpenGL: replace gluProject and gluUnProject, and simplify surrounding code.
2017-02-26 00:16:46 +01:00
datafiles
Remove SCons building system
2016-01-04 14:20:48 +05:00
gpencil
Cleanup: warnings
2017-03-02 00:36:33 +11:00
include
Remove all instance of OBACT from particle_edit.c and related changes
2017-03-02 17:14:59 +01:00
interface
Merge branch 'master' into blender2.8
2017-03-02 19:15:32 +01:00
io
COLLADA: Removed obsolete Export select option 'Both' which created invalid data (duplicate transformation information for nodes)
2016-11-02 14:11:46 +01:00
mask
rename built-in point shaders, SMOOTH --> AA
2017-02-28 02:18:52 -05:00
mesh
OpenGL: replace gluProject and gluUnProject, and simplify surrounding code.
2017-02-26 00:16:46 +01:00
metaball
Fix T47969: Select Random always uses same seed
2016-03-29 01:24:57 +11:00
object
Merge branch 'master' into blender2.8
2017-03-02 19:15:32 +01:00
physics
Merge branch 'master' into blender2.8
2017-03-02 19:15:32 +01:00
render
Remove all instances of OBACT from drawobject.c and related changes
2017-03-02 17:09:24 +01:00
screen
Remove tons of OBACT
2017-03-02 17:09:24 +01:00
sculpt_paint
Remove all instances of OBACT from drawobject.c and related changes
2017-03-02 17:09:24 +01:00
sound
Fix: Audio plays back incorrectly after rendering to a video file
2017-01-06 18:18:20 +01:00
space_action
Cleanup: Style
2017-02-22 18:54:56 +01:00
space_api
Revert "Collection Editor based on patch by Julian Eisel"
2017-02-15 18:17:34 +01:00
space_buttons
Layers: Separate between scene render layer (F12) and context render layer (everything else)
2017-02-15 19:29:09 +01:00
space_clip
Merge branch 'master' into blender2.8
2017-03-02 00:22:13 +11:00
space_console
Cleanup: Style
2017-02-22 18:54:56 +01:00
space_file
clean up GL / GPU #includes
2017-02-28 15:30:39 -05:00
space_graph
OpenGL: no more display lists
2017-02-28 13:15:11 -05:00
space_image
Remove tons of OBACT
2017-03-02 17:09:24 +01:00
space_info
Remove most (maybe all?) remaining yellow text
2017-02-10 00:17:50 +01:00
space_logic
Render Layers and Collections (merge from render-layers)
2017-02-07 11:11:00 +01:00
space_nla
OpenGL: keyframe shape fixes
2017-02-28 01:21:27 -05:00
space_node
rename built-in point shaders, SMOOTH --> AA
2017-02-28 02:18:52 -05:00
space_outliner
Outliner: add hooks for (yet to be implemented) layer reordering routines
2017-03-02 18:12:30 +01:00
space_script
Remove SCons building system
2016-01-04 14:20:48 +05:00
space_sequencer
Merge branch 'master' into blender2.8
2017-03-02 00:22:13 +11:00
space_text
Merge branch 'master' into blender2.8
2017-01-16 21:03:12 +01:00
space_time
Sorted BaseLegacy > Base convertions
2017-02-14 18:21:47 +01:00
space_userpref
Remove SCons building system
2016-01-04 14:20:48 +05:00
space_view3d
Merge branch 'master' into blender2.8
2017-03-02 19:15:32 +01:00
transform
Merge branch 'master' into blender2.8
2017-03-02 19:15:32 +01:00
util
Remove all instance of OBACT from particle_edit.c and related changes
2017-03-02 17:14:59 +01:00
uvedit
remove unused code from uvedit_draw
2017-02-28 15:30:39 -05:00
CMakeLists.txt
Revert "Collection Editor based on patch by Julian Eisel"
2017-02-15 18:17:34 +01:00