griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
77,005 Commits 1 Branch 0 Tags
f43e3d0b6bee3bef69649e4ebb85bdebdf19e8ce
Commit Graph

61915 Commits

Author SHA1 Message Date
Clément Foucault
f43e3d0b6b DRW: Fix DRW_shgroup_call_procedural_* vertex count. 2018-05-31 19:09:20 +02:00
Clément Foucault
494470ba23 GPUTexture: Expose GPU_texture_create_buffer and add GL_R32I support. 2018-05-31 19:09:20 +02:00
Clément Foucault
8789490f96 LoopTri: Fix example code. 
For real guys! Test your example code!
 2018-05-31 19:09:20 +02:00
Clément Foucault
71c904433c DRW: Fix stick bones memory leak. 2018-05-31 19:09:20 +02:00
Bastien Montagne
2feed9bdef Fix Collada building... 2018-05-31 18:37:33 +02:00
Bastien Montagne
f71efafe8f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/space_image/image_edit.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_material.c
	source/blender/makesrna/intern/rna_sculpt_paint.c
	source/blender/makesrna/intern/rna_space.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-05-31 18:35:14 +02:00
Bastien Montagne
cfea9c261c Cleanup: Remove G.main from some editor files. 2018-05-31 18:23:20 +02:00
Sergey Sharybin
df22cd9ce1 Depsgraph: Fixes to prevent object duplicate to jump 
This includes:

- Skip OB_RECALC_TIME tag from object duplicate operator
  not sure why it is needed: even if original object was
  animated, duplicating it will copy evaluated values.

- Don't tag whole ID for update when updating it after
  relations rebuilt. Use the same trickery to detect
  whether animation is to be re-evaluated or not as is
  done for update flag=0.

- Don't tag datablocks which are expanded for update
  of copy-on-write.

- Avoid flush along relation from copy-on-write
  operation in action. This will not invalidate any
  pointers in the copied datablock since we don't
  reference anything in the action.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
3352dd3a3f Depsgraph: Remove unused flags 
They are no longer needed after the active depsgraph concept is here.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
126e6c8e1d Transform: Read all data from original objects 
This is now guaranteed to be in sync with evaluated state for an active
dependency graph.

Solves issue with duplicating animated object.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
59a516913e Depsgraph: Copy evaluated data to original datablock 
Only do it for active dependency graph.

Currently covers animation, drivers, object and pose channel matricies.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
b5b1f9d11c Depsgraph: Consider depsgraphs used by workspace as active 
Will cause some bad behavior when object is shared across multiple
visible view layers with different overrides. Accept it for now,
and possibly force single view layer later.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
7a4b0ff358 Depsgraph: Begin concept of active dependency graph 
When active dependency graph is evaluated, it will apply animation,
drivers and scalar evaluation data (such as object matrix) to an
original datablock. This way operators and tools can easily read
data from original datablock.

This will simplify porting them to copy-on-write, and solve issues
when some operator will allocate new datablock based on original one,
and will want to read data from it.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
d4daf9c00d Depsgraph: Forbid update flush to go from copy-on-write to animation 2018-05-31 18:07:55 +02:00
Sergey Sharybin
cd702db338 Animation: Pass dependency graph to animation system 
This way we allow animation system to make decisions based on which
context dependency graph is coming from, and whether it belongs to
an active edit window or not.
 2018-05-31 18:07:55 +02:00
Sergey Sharybin
48ea2131aa Sequencer: Make dependency graph part of sequencer context 
Currently unused, but will be needed soon to deal with active edit
window context.
 2018-05-31 18:07:55 +02:00
Campbell Barton
cb614107d3 UI: fix own error switching fake space types 2018-05-31 18:00:17 +02:00
Bastien Montagne
5a82aee9e6 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/mball.c
	source/blender/editors/object/object_add.c
	source/blender/render/intern/source/convertblender.c
 2018-05-31 16:57:39 +02:00
Campbell Barton
8d53e8cd02 UI: hide user preferences from space menu 
See T54744
 2018-05-31 16:46:24 +02:00
Bastien Montagne
da11e33b26 Cleanup: remove G.main from BKE mball code. 2018-05-31 16:44:05 +02:00
Campbell Barton
361b3eb88e Cleanup: warning 2018-05-31 16:36:24 +02:00
Bastien Montagne
eb1feb9f4a Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_select.c
	source/blender/editors/space_outliner/outliner_edit.c
 2018-05-31 16:21:47 +02:00
Bastien Montagne
16100f8261 Cleanup: get rid of last G.main usages in BKE library code. 2018-05-31 16:04:04 +02:00
Bastien Montagne
b809340960 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/modifier.c
	source/blender/blenkernel/intern/object_update.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/editors/object/object_modifier.c
	source/blender/editors/physics/physics_fluid.c
	source/blender/makesrna/intern/rna_particle.c
	source/blender/modifiers/intern/MOD_particlesystem.c
 2018-05-31 15:37:15 +02:00
Bastien Montagne
b53d358261 Cleanup: remove G.main from BKE modifier. 2018-05-31 15:24:30 +02:00
Sergey Sharybin
3248ac5e83 Cleanup: Remove unused variable 2018-05-31 15:02:12 +02:00
Dalai Felinto
25e5ec245c Support Move / Link to collection in the outliner as well 2018-05-31 14:52:05 +02:00
Dalai Felinto
d0af8edcd1 Outliner: Expose collections editors poll in ED_outliner.h 2018-05-31 14:52:05 +02:00
Dalai Felinto
eaad4caa56 Link to Collection - Add shortcut (Shift + M) 2018-05-31 14:52:05 +02:00
Joshua Leung
54e92bbd29 Fix: View All in Action Editor zoomed in far enough to enter "crazy mode" with a single keyframe 
Now, when there's just a single keyframe, pressing HomeKey will instead
just center the view instead of trying to do "frame range" + margin.
 2018-05-31 14:51:28 +02:00
Sybren A. Stüvel
4e96bff938 Update CoW when adding/removing pose in pose library 2018-05-31 13:53:40 +02:00
Joshua Leung
f56a9fbad5 Depsgraph: Remove the "disable-copy-on-write" option completely 
After discussion with Sergey and Dalai, we have decided to remove
this option completely. We're getting to the point where it is almost
impossible to really use 2.8 without COW, and keeping the old option
running ends up diverting dev resources away towards tracking down
and fixing problems with a parallel system that will be going away.
 2018-05-31 13:43:00 +02:00
Bastien Montagne
9b4e56c091 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_camera.h
	source/blender/blenkernel/BKE_dynamicpaint.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/intern/camera.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/physics/dynamicpaint_ops.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-05-31 12:57:24 +02:00
Bastien Montagne
28369f725c Cleanup: remove G.main from BKE object 
Had to add some G.main to modifiers, but in 2.8 we do not need that
anymore, so it's not that bad! ;)
 2018-05-31 12:27:47 +02:00
Sybren A. Stüvel
23e375a281 Revert "Tag COW when applying pose from pose library" 
This reverts commit 24b03729ae5ba4561ace8cbfb2d56cdbde781589; committed
too soon.
 2018-05-31 12:00:18 +02:00
Sybren A. Stüvel
24b03729ae Tag COW when applying pose from pose library 
Related to T55232
 2018-05-31 11:59:04 +02:00
Brecht Van Lommel
9948e26e14 Fix depsgrah copying and evaluating hidden collections. 2018-05-31 11:43:29 +02:00
Sergey Sharybin
46cfa605c3 Cleanup: Reduce indentation level 2018-05-31 11:17:57 +02:00
Bastien Montagne
17f458ff32 Merge branch 'master' into blender2.8 2018-05-31 11:08:02 +02:00
Bastien Montagne
24d1829243 Cleanup: nuke G.main out of BKE PackedFile code. 2018-05-31 11:07:14 +02:00
Brecht Van Lommel
fcfe1963a6 Fix depsgraph copying and evaluating hidden objects. 2018-05-31 10:37:13 +02:00
Campbell Barton
5cbad89637 Cleanup: unused defines 2018-05-31 10:15:48 +02:00
Campbell Barton
12ab59a2d6 Merge branch 'master' into blender2.8 2018-05-31 10:03:15 +02:00
Campbell Barton
84a9647f22 Cleanup: use doxy sections for space types 
Also use struct names in enum/define comments.
 2018-05-31 09:49:58 +02:00
Campbell Barton
d9324b61d5 Cleanup: return types in stubs 2018-05-31 09:49:44 +02:00
Brecht Van Lommel
e4afccf388 Depsgraph: optimization of driver evaluation with many drivers. 2018-05-31 09:46:21 +02:00
Campbell Barton
e910765ad0 WM: Use tool-system for setting brushes 
This sets the tool instead of the brush, with cycling support.
 2018-05-31 09:04:15 +02:00
Campbell Barton
81bf9a41e1 Tool System: Utility to set the tool by name 
Wrapper for the Python operator.
 2018-05-31 09:02:43 +02:00
Jeroen Bakker
fbd614f1fa Workbench: Highlights 
Made the highlights darker (using the defaults of blender 2.7
- sharpness = 50
- spec color = 0.025 (I bumped it to 0.1)
- added a log2 to the frontal camera light to reveal more details of the
mesh
 2018-05-30 22:19:10 +02:00
Campbell Barton
264a4a8f97 RNA: add tool index access 
Needed for changing the active tool from Python.
 2018-05-30 22:16:13 +02:00