griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
75,150 Commits 1 Branch 0 Tags
caa7101df545bf5f3827fd26216b7e6d83e2f452
Commit Graph

60286 Commits

Author SHA1 Message Date
Campbell Barton
caa7101df5 Fix edit-bone select crash w/ multi-edit 
Also avoid duplicate base lookups and minor cleanup.
 2018-04-19 11:30:22 +02:00
Campbell Barton
f2a3579661 Fix bug with NULL context being used in undo 
Caused sculpt to crash.
 2018-04-19 11:12:57 +02:00
Jeroen Bakker
3a4a5ed378 Workbench: added draw_scene_finish to workbench_materials 2018-04-19 10:41:24 +02:00
Bastien Montagne
79899373eb Finish use-after-free in workbench code. 
GHash should probably not own the data itself, but that's other question
to be fixed later, at least this fixes the crash.

Solution by @fclem, thanks!
 2018-04-19 10:25:52 +02:00
Jeroen Bakker
8a923e5295 Code cleanup 2018-04-19 09:51:22 +02:00
Jeroen Bakker
163b631122 Merge branch 'blender2.8' of git.blender.org:blender into blender2.8 2018-04-19 09:49:44 +02:00
Jeroen Bakker
16fac020e0 Workbench: Option to use Object color 
- added `object_color_type` where the user can set if the collection
determines the color, or the object will be used for the color.
Implemented it as an enum as later this can have a random color option.
- moved OB_LIGHTING_* to DNA_view3d_types and renamed it.
- Fixed some DRY in workbench_materials.c. Can remove more DRY's but
will need to discuss the responsibility of the workbench engine as it
might become part of the eevee renderer.
 2018-04-19 09:45:52 +02:00
Campbell Barton
95a45e308d BMesh: Add back call to finish operator 
Was commented in multi-edit patch, finish is needed to free memory.
 2018-04-19 09:10:10 +02:00
Campbell Barton
81673f5ab7 Fix T54712: Undo w/ multi-edit failed 2018-04-19 08:58:49 +02:00
Campbell Barton
9a301978bd Merge branch 'master' into blender2.8 2018-04-19 08:18:42 +02:00
Campbell Barton
fcac9e8410 Cleanup: style 2018-04-19 08:18:16 +02:00
Campbell Barton
9f7f6d5540 Undo: add missing flag for text delete 2018-04-19 08:16:37 +02:00
Campbell Barton
1f5d51e44e Cleanup: style 2018-04-19 07:47:03 +02:00
Thomas Beck
5b45d32f3a Edit Mesh: multi-object support for 'Decimate Geometry' 2018-04-19 00:30:05 +02:00
Thomas Beck
7c415e6fd7 Edit Mesh: multi-object support for 'Vertices Only' extrusion (Alt+E) 2018-04-19 00:03:51 +02:00
Thomas Beck
07774d4860 Edit Mesh: multi-object support for 'Individual Faces' extrusion (Alt+E) 2018-04-18 23:55:27 +02:00
Thomas Beck
d8f70a26fd Edit Mesh: multi-object support for 'Edges Only' extrusion' 2018-04-18 23:53:21 +02:00
Thomas Beck
1ade071052 Edit Mesh: multi-object duplicate_move support 2018-04-18 23:18:08 +02:00
Campbell Barton
abeae5d38e Cleanup: indent face poke example 2018-04-18 23:16:34 +02:00
Campbell Barton
75133f5d7c Cleanup: Use BLI_layer / BLI_view_layer prefix 
Also use doxy sections for iterators.
 2018-04-18 21:18:05 +02:00
Campbell Barton
69c42ad57b Cleanup: consistent changed_multi assignment 2018-04-18 19:22:00 +02:00
Dalai Felinto
4704f2687a Edit Mesh: multi-object flip normals support 2018-04-18 19:15:01 +02:00
Campbell Barton
7560aabf71 Pose: multi-object Flip Quats 2018-04-18 19:11:11 +02:00
Campbell Barton
e0478ae92f Pose: multi-object support for clear transform 2018-04-18 18:56:27 +02:00
Campbell Barton
602f0bc2d4 Use macros for looping over pose bones 2018-04-18 18:56:27 +02:00
Campbell Barton
42b0cd1ea0 MSVC: use 'unsigned int' 2018-04-18 18:56:27 +02:00
Sergey Sharybin
ec0756af6c Depsgraph: Fix base flag flush for objects from set scene 
Fixes view_layer_background_set regression test.

This makes Dalai happy! :)
 2018-04-18 18:05:37 +02:00
Sergey Sharybin
3701cf785c Depsgraph; Correct assert for depsgraph scene 
We can not do it from builder, since builder will pull set scenes.
 2018-04-18 17:43:15 +02:00
Sergey Sharybin
3c7254ffb6 Depsgraph: Fix missing bases array update 
view_layer_object_copy test was broken.

This is a quick fix for now, can be optimized further later.
 2018-04-18 17:35:05 +02:00
Campbell Barton
4ec55350d4 Edit Mesh: improve subdivide multi-object 
Don't run the operator on faces/edges without selection.
 2018-04-18 17:22:51 +02:00
Campbell Barton
3a9669bfff Edit Mesh: multi-object poke support 2018-04-18 17:15:58 +02:00
Brecht Van Lommel
f9cf2e2f6c Workspaces: remove workspace engine, use 3D viewport draw mode instead. 
ViewRender was removed, which means we can't get the render engine for files
saved in 2.8. We assume that any files saved in 2.8 were intended to use Eevee
and set the engine to that.

A fix included with this is that .blend thumbails now draw with Clay mode,
and never Eevee or Cycles. These were drawn with solid mode in 2.7, and should
be very fast and not e.g. load heavy image textures.

Differential Revision: https://developer.blender.org/D3156
 2018-04-18 16:35:38 +02:00
Brecht Van Lommel
15850a8740 Workbench: don't change to workbench drawtype for files saved in 2.8. 
Assume files saved in 2.8 were intended for Eevee and set them to material
viewport shading. In Eevee this is equal to rendered draw mode, in Cycles
this will draw with Eevee. This way Eevee demo files still show something
interesting when opened.
 2018-04-18 16:35:38 +02:00
Germano
34dbe7ff33 UV Edit Draw: Fix assert in immBeginBatch -> vertex_count_makes_sense_for_primitive. 2018-04-18 11:34:44 -03:00
Sergey Sharybin
24b3b9fa21 Fix bad merge conflict resolution 
Line got lost..
 2018-04-18 16:12:56 +02:00
Sergey Sharybin
3b209a45de Fix missing initialization of depsgraph for snapping context 
Was causing crashes once attempting to use snapping.

Reported by mano-wii in IRC, thanks!
 2018-04-18 15:41:51 +02:00
Jeroen Bakker
2108142934 Workbench: use SET_UINT_IN_POINTER for hashes 2018-04-18 15:16:21 +02:00
Jeroen Bakker
c86975d90a Merge branch 'blender2.8' into blender2.8-workbench 2018-04-18 15:06:03 +02:00
Jeroen Bakker
5cc92a376b Workbench: fixed C++ style comments 2018-04-18 14:56:25 +02:00
Sergey Sharybin
b3e479757e Cleanup: Indentation 2018-04-18 14:46:33 +02:00
Sybren A. Stüvel
3bacd17b1c Added comment to explain MeshRenderData.orco 2018-04-18 14:13:20 +02:00
Sergey Sharybin
c67a2bd5ba Merge branch 'master' into blender2.8 2018-04-18 13:55:09 +02:00
Sergey Sharybin
f28aec17e9 Depsgraph: Fix missinf relation for particle instance modifier 
Was causing lack of animation update when particle system had simulation,
 2018-04-18 13:54:02 +02:00
Jeroen Bakker
8a71c139d8 Merge branch 'blender2.8' into blender2.8-workbench 2018-04-18 13:53:22 +02:00
Jeroen Bakker
a091da7ffa Workbench: reuse similar materials 
Similar materials will reuse the same shadergroup. Currently using
a custom hash function that might select too similar colors into the
same material.

Reintroduced the workbench_materials.c this file will be responsible for
material lookup/creation and shader compilation

Fixed a GPUShader mem leak
 2018-04-18 13:44:33 +02:00
Sergey Sharybin
3811998177 Cleanup: Trailing whitespace 2018-04-18 12:31:26 +02:00
Sybren A. Stüvel
9b338e8028 Merge remote-tracking branch 'origin/master' into blender2.8 
Explicitly undoing 287d1924fa here, as that was a master-only change.
 2018-04-18 12:28:13 +02:00
Sybren A. Stüvel
287d1924fa Remove irrelevant print statement 
This statement is only relevant in 2.8, but causes confusion in master.
I kept the 'default' label to prevent compiler warnings about unhandled
cases. The break is needed because there should be at least one statement
after 'default'.
 2018-04-18 12:26:40 +02:00
Jeroen Bakker
ea0630ade6 Merge branch 'blender2.8' of git.blender.org:blender into blender2.8 2018-04-18 12:11:59 +02:00
Jeroen Bakker
661226959c WORKBENCH: Solve C2016 compile errors 2018-04-18 12:11:36 +02:00