griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
79,088 Commits 1 Branch 0 Tags
918288138d19c7cd7936705bef7947d941abe708
Commit Graph

3686 Commits

Author SHA1 Message Date
Brecht Van Lommel
c48eb52164 Fix Cycles headless render failing, after grease pencil merge. 
Now it should at least succeed when there are no grease pencil objects.
 2018-08-01 14:47:02 +02:00
Antonioya
66da2f537a New Grease Pencil object for 2D animation 
This commit merge the full development done in greasepencil-object branch and include mainly the following features.

- New grease pencil object.
- New drawing engine.
- New grease pencil modes Draw/Sculpt/Edit and Weight Paint.
- New brushes for grease pencil.
- New modifiers for grease pencil.
- New shaders FX.
- New material system (replace old palettes and colors).
- Split of annotations (old grease pencil) and new grease pencil object.
- UI adapted to blender 2.8.

You can get more info here:

https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/
https://code.blender.org/2018/07/grease-pencil-status-update/

This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible.

Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
 2018-07-31 10:50:43 +02:00
Sergey Sharybin
d7b472c198 Fix wrong view layer rendered from command line 
The issue was caused by Render Single Layer option enabled, which is
very handy for artists work, so they can hit F12 and see view layer
they are currently working in a final rendered state. This saves a lot
of time since all the "non-interesting" objects are ignored for such
iterations.

However, for the render farm we need to render view layers which are
explicitly set for render, and ignore active view layer.

Reasonable solution seems to be to ignore the Render Single Layer
option when rendering from the command line. It is really something
more like UI behavior option.
 2018-07-23 11:54:41 +02:00
Clément Foucault
8cd7828792 GWN: Port to GPU module: Replace GWN prefix by GPU 2018-07-18 11:49:15 +02:00
Clément Foucault
247ad2034d GWN: Port to GPU module: Move files to GPU 
This does not include all the struct and type renaming. Only files were
renamed.

gwn_batch.c/h was fusioned with GPU_batch.c/h
gwn_immediate.c/h was fusioned with GPU_immediate.c/h
gwn_imm_util.c/h was fusioned with GPU_immediate_util.c/h
 2018-07-18 00:17:57 +02:00
Brecht Van Lommel
a6ea38d345 Cleanup: remove unused interlace code after removal of fields. 2018-07-10 17:58:08 +02:00
Clément Foucault
e30f25ba22 GHOST: Fix assert and rebind previous ogl context. 2018-07-03 13:36:04 +02:00
Campbell Barton
36a9436d80 Merge branch 'master' into blender2.8 2018-07-01 16:22:06 +02:00
Campbell Barton
ddee0931b8 RNA: use bool for boolean RNA types 
We were using int's for bool arguments in BKE,
just to avoid having wrapper functions.
 2018-07-01 15:57:59 +02:00
Campbell Barton
9bd0c63382 Merge branch 'master' into blender2.8 2018-06-29 08:05:38 +02:00
Campbell Barton
af36dd4664 Cleanup: trailing newlines 2018-06-29 08:02:49 +02:00
Sergey Sharybin
7a4b784909 Subsurf: Move away from using scene from modifier data 2018-06-22 15:12:03 +02:00
Antonioya
c45a3b80e2 Fix T55555: Crash when select material properties 
This error is only in Windows and Mac when select in properties the material tab.

This commit revert dc856be839 Preview: Add own opengl context to render preview images.
 2018-06-21 16:11:29 +02:00
Bastien Montagne
9c20de8998 Merge branch 'master' into blender2.8 2018-06-19 19:25:44 +02:00
Bastien Montagne
0a8af46707 Final cleanup of G.mains in render area. 2018-06-19 19:25:06 +02:00
Campbell Barton
56173e512c Merge branch 'master' into blender2.8 2018-06-17 16:18:15 +02:00
Campbell Barton
a0a1fc8938 Cleanup: BLI path extension API 
Use BLI_path_extension_* prefix.
 2018-06-17 16:13:24 +02:00
Bastien Montagne
ecc57e7524 Merge branch 'master' into blender2.8 2018-06-15 17:43:18 +02:00
Bastien Montagne
d645b1a78a Cleanup: some more G.main removal. 
We are really starting to scratch the last bits here...
 2018-06-15 17:42:17 +02:00
Lukas Stockner
525be2f579 Image: Refactor render slots to a dynamic list 
Previously, render slots were hardcoded to a fixed amount.

With this change, render slots now are stored in a list. Therefore, users can add and/or remove as many slots as they want.

Credit to brecht for the UI part.

Reviewers: brecht, sergey

Differential Revision: https://developer.blender.org/D3474
 2018-06-14 22:46:30 +02:00
Clément Foucault
dc856be839 Preview: Add own opengl context to render preview images. 2018-06-14 18:17:28 +02:00
Bastien Montagne
1a79c6d360 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenkernel/intern/node.c
	source/blender/blenkernel/intern/particle.c
 2018-06-13 11:02:48 +02:00
Bastien Montagne
67e8c1e1c7 Cleanup: remove more G.main from BKE area. 2018-06-13 10:57:10 +02:00
Brecht Van Lommel
3801736b89 Depsgraph: remove object tagging hack for render. 
With copy-on-write it should now all be evaluated correctly in render
resolution, without needing to switch the original data resoluton.
 2018-06-12 17:07:18 +02:00
Sergey Sharybin
46cb64917d Render: Remove global RNG usage 
We shouldn't be using BI textures anyway. But in any case, adding noise
texture to compositor is doing proper seed updates already, so probably
was already ported to a proper RNG usage.
 2018-06-12 15:38:29 +02:00
Bastien Montagne
c98b2e74df Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
 2018-06-12 12:38:54 +02:00
Bastien Montagne
75bcb70c60 Cleanup: remove some G.main from BKE area. 2018-06-12 11:21:54 +02:00
Brecht Van Lommel
05111d79d0 Cleanup: remove unused DAG_EVAL_PREVIEW mode. 2018-06-11 17:06:28 +02:00
Brecht Van Lommel
73b9531dcf Fix incorrect object selection test in outliner and rigid body. 2018-06-11 17:06:28 +02:00
Brecht Van Lommel
84692844a3 Fix merge error in 908b696, removed files were accidentally added back. 2018-06-11 17:06:28 +02:00
Bastien Montagne
204c167c72 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c
 2018-06-11 16:02:46 +02:00
Bastien Montagne
78a8d3685b Cleanup: remove moar ugly G.main usages... 
BKE_image was an ugly nest, could fix all but the ones from compositor,
so moved ugly G.main there, at least we know where the Evil is that way ;)
 2018-06-11 15:40:37 +02:00
fclem
5ad7bda45f Render: Fix build problem with missing GL/glew.h 2018-06-11 13:00:21 +02:00
Bastien Montagne
160cb9a284 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_object.cpp
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/alembic/intern/abc_mball.cc
	source/blender/alembic/intern/abc_mball.h
	source/blender/blenkernel/BKE_anim.h
	source/blender/blenkernel/BKE_displist.h
	source/blender/blenkernel/BKE_dynamicpaint.h
	source/blender/blenkernel/BKE_group.h
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/BKE_mball_tessellate.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/BKE_scene.h
	source/blender/blenkernel/intern/anim.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/displist.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/group.c
	source/blender/blenkernel/intern/mball.c
	source/blender/blenkernel/intern/mball_tessellate.c
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/object_dupli.c
	source/blender/blenkernel/intern/object_update.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/editors/include/ED_object.h
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_edit.c
	source/blender/editors/object/object_modifier.c
	source/blender/editors/physics/dynamicpaint_ops.c
	source/blender/editors/sculpt_paint/paint_vertex.c
	source/blender/editors/sculpt_paint/sculpt_uv.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_snap_object.c
	source/blender/editors/util/ed_util.c
	source/blender/gpu/intern/gpu_material.c
	source/blender/makesrna/intern/rna_meta.c
	source/blender/makesrna/intern/rna_object_api.c
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
 2018-06-11 14:39:38 +02:00
Clément Foucault
b7bf8b3757 Render: Create a separate gl context for rendering. 
This should take care of all the threading stability issues some people
are reporting.
 2018-06-11 13:55:02 +02:00
Bastien Montagne
d0956e9cb3 Cleanup: Moar G.main removal of Hell. 
This commit actually adds some G.main... but at much, much higher level
than the ones it removes, so should still be better ;)
 2018-06-11 12:15:14 +02:00
Sergey Sharybin
c5904574cb Fix T55391: Anim render only shows scene state at current frame (no animation) 2018-06-08 12:12:52 +02:00
Campbell Barton
908b6960c0 Merge branch 'master' into blender2.8 2018-06-08 08:10:35 +02:00
Campbell Barton
a25c11fd8d Cleanup: trailing space 
Remove from blender/nodes, collada, blenfont & render.
 2018-06-08 08:07:48 +02:00
Bastien Montagne
f0d9dbae0d Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/blendfile.c
	source/blender/blenloader/intern/readfile.h
	source/blender/blenloader/intern/versioning_250.c
	source/blender/blenloader/intern/versioning_260.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/blenloader/intern/versioning_legacy.c
	source/blender/editors/render/render_shading.c
	source/blender/makesrna/intern/rna_movieclip.c
	source/blender/render/intern/source/pipeline.c
	source/blender/render/intern/source/voxeldata.c
 2018-06-05 17:02:50 +02:00
Bastien Montagne
481cdb08ed Cleanup: use new accessors to blendfile path (Main.name). 2018-06-05 16:33:46 +02:00
Brecht Van Lommel
784a3ccf79 Fix hang rendering with motion blur. 2018-06-04 17:36:02 +02:00
Campbell Barton
bfe1d0e0dc Merge branch 'master' into blender2.8 2018-06-01 18:26:42 +02:00
Campbell Barton
75fc1c3507 Cleanup: trailing whitespace (comment blocks) 
Strip unindented comment blocks - mainly headers to avoid conflicts.
 2018-06-01 18:19:39 +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
Bastien Montagne
da11e33b26 Cleanup: remove G.main from BKE mball code. 2018-05-31 16:44:05 +02:00
Brecht Van Lommel
08862b8246 Render API: rename some API functions back to earlier names. 
Their purpose is the same, no reason to break API compatibility here.
 2018-05-30 18:17:49 +02:00
Sergey Sharybin
b20449cc08 Cycles/Render API: changes for better copy-on-write support. 
Mainly just passing the depsgraph and evaluated scene and camera, instead of
the original one. Patch by Sergey, further modifications by Brecht.
 2018-05-23 13:21:02 +02:00
Brecht Van Lommel
5667822876 Cycles: convert pointdensity from DerivedMesh to COW Mesh. 
Fixes hang in regression tests.
 2018-05-23 11:28:26 +02:00