Tamito Kajiyama
829e25c922
Fix for wrong link in the line style shader nodes due to a typo.
2014-08-12 10:10:47 +09:00
Tamito Kajiyama
7dd605e361
Fix for SCENE_OT_freestyle_stroke_material_create not respecting "use_nodes" line style prop.
2014-08-12 10:10:46 +09:00
Tamito Kajiyama
7852fc8bcd
Freestyle: Proper support for alpha transparency in line style shader nodes for Cycles.
2014-08-12 10:10:45 +09:00
Tamito Kajiyama
2843aa1501
Freestyle: Fix for error handling in SCENE_OT_freestyle_stroke_material_create.
2014-08-12 10:10:44 +09:00
Tamito Kajiyama
cc33d73185
Freestyle: Fix for an increasing reference count of images in copied Image Texture shader nodes.
2014-08-12 10:10:43 +09:00
Tamito Kajiyama
45af769020
Freestyle: Properly reconnect links from a UV Along Stroke node to a UV Map node.
2014-08-12 10:10:42 +09:00
Tamito Kajiyama
e457dfec32
Freestyle: Updated BKE_linestyle_default_shader() to include the UV Along Stroke shader node.
2014-08-12 10:10:41 +09:00
Tamito Kajiyama
52d357a0b5
Freestyle: Added new UV Along Stroke shader node.
2014-08-12 10:10:40 +09:00
Tamito Kajiyama
6a5b8e91b1
Freestyle: removed unnecessary call of node_type_storage() in the definition of the Output Line Style node.
2014-08-12 10:10:39 +09:00
Tamito Kajiyama
6f60ca3cd4
Freestyle: Caching of auto-generated materials from line style shader nodes.
2014-08-12 10:10:38 +09:00
Tamito Kajiyama
7b1234be1c
Removed/disabled debugging code.
2014-08-12 10:10:37 +09:00
Tamito Kajiyama
34c133a488
Freestyle: an improved workflow of line style shading nodes.
...
Removed the previous changes for passing a line style through the Controller, and
revised the BlenderTextureShader to assign the shader node tree of a line style
(if specified) to strokes. This way the assignment of shading nodes can be done
through both the Freestyle GUI and Python scripting.
2014-08-12 10:10:36 +09:00
Tamito Kajiyama
c38e80d632
WIP commit just for a record of a working snapshot of code revisions for node-based textured strokes.
2014-08-12 10:10:35 +09:00
Tamito Kajiyama
a2a2d4679a
Made temporary changes to use G.main rather than Freestyle-local Main for debugging.
2014-08-12 10:10:34 +09:00
Tamito Kajiyama
622ef089f9
Freestyle: Fix for a crash during access to Scene properties from within Python.
2014-08-12 10:10:33 +09:00
Tamito Kajiyama
4fc2b8dcc6
Added BKE_linestyle_use_textures() to check if stroke textures are enabled.
2014-08-12 10:10:32 +09:00
Tamito Kajiyama
1ddb8e238e
Freestyle: Keep a reference of the line style in Stroke rather than in StrokeRep.
2014-08-12 10:10:31 +09:00
Tamito Kajiyama
7f3488f992
Freestyle: show "use_nodes" option in the UI when Cycles is enabled.
...
The "use_textures" option is intended for the BI and does not make sense in Cycles.
2014-08-12 10:10:30 +09:00
Tamito Kajiyama
83360eccae
Fix for renamed API functions in rB415af0b.
2014-08-12 10:10:29 +09:00
Tamito Kajiyama
701f0356df
Freestyle: Removed a debug print in BlenderStrokeRenderer::GetStrokeShader().
2014-08-12 10:10:28 +09:00
Tamito Kajiyama
722951eceb
Freestyle: Added "blend_type" and "use_clamp" options to the Output Line Style shader node.
2014-08-12 10:10:27 +09:00
Tamito Kajiyama
833353b25e
Freestyle: Fix for a crash in BKE_linestyle_default_shader() due to a typo.
2014-08-12 10:10:26 +09:00
Tamito Kajiyama
7e9ac19b2c
Freestyle: Fix for stroke_shader node default values copied from the Output Line Style node.
2014-08-12 10:10:24 +09:00
Tamito Kajiyama
1b65faf90b
Freestyle: Changed the default Color value of the Output Line Style node.
2014-08-12 10:10:23 +09:00
Tamito Kajiyama
cb75f79b8a
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree.
...
Changes to ED_node_shader_default() were reverted since the code there was actually
not suitable for setting up the default line style node tree properly.
2014-08-12 10:10:22 +09:00
Tamito Kajiyama
4e11fcead0
Follow-up to rB647969f9b617: Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene().
2014-08-12 10:10:21 +09:00
Tamito Kajiyama
fc85446c50
Freestyle: Added preliminary support for textured strokes in Cycles.
...
Now the shader node tree of a line style ID datablock is used to define textures
as well as their mapping and influence.
TODO: Textures alpha channel mapping and influence.
TODO: Blend mode in the Output Line Style shader node.
2014-08-12 10:10:20 +09:00
Tamito Kajiyama
4677684cfd
Changed ntreeCopyTree_ex() to accept a pointer to struct Main.
2014-08-12 10:10:19 +09:00
Tamito Kajiyama
d8f60d01e9
Fix for a wrong ID datablock referenced due to a typo in BKE_copy_linestyle().
2014-08-12 10:10:18 +09:00
Tamito Kajiyama
846ec6e00c
Added new Output Line Style shader node for defining a node-based line material.
2014-08-12 10:10:17 +09:00
Tamito Kajiyama
60cdf97c3d
Minor fix for texture category name.
2014-08-12 10:10:16 +09:00
Tamito Kajiyama
91c31efe01
Enabled USE_CYCLES_FOR_STROKE_RENDERING compile-time flag by default.
2014-08-12 10:10:15 +09:00
Tamito Kajiyama
87f75299e1
Implemented a basic framework for node-based shaders.
...
Shader nodes will be used to define materials for stroke rendering, so as to
allow users to interactively configure textures.
2014-08-12 10:10:14 +09:00
Tamito Kajiyama
d956a074e3
Freestyle: Show the Freestyle Line panel of the Material properties context also in Cycles
2014-08-12 10:10:13 +09:00
Tamito Kajiyama
1e513658de
Always use the Blender Internal renderer for stroke rendering.
2014-08-12 10:10:12 +09:00
Tamito Kajiyama
d459d102b5
Added new operator "Create Freestyle Stroke Material" for testing.
2014-08-12 10:10:11 +09:00
Tamito Kajiyama
1741df1e36
Removed debug prints.
2014-08-12 10:10:11 +09:00
Tamito Kajiyama
ea1f54d8f3
Fix for hard-coded #include file paths.
2014-08-12 10:10:10 +09:00
Tamito Kajiyama
db6d2a6fe1
Fix for nested Cycles sessions.
2014-08-12 10:10:09 +09:00
Tamito Kajiyama
b272b729ce
Removed ad-hoc use of R_PERSISTENT_DATA for Freestyle/Cycles.
2014-08-12 10:10:08 +09:00
Tamito Kajiyama
4a39df5bc3
Added debug prints.
2014-08-12 10:10:07 +09:00
Tamito Kajiyama
f75d87bd76
Initial implementation of Cycles materials for Freestyle stroke rendering.
2014-08-12 10:10:06 +09:00
Tamito Kajiyama
f70e1ad2fb
Proof-of-concept implementation of Freestyle support for Cycles.
2014-08-12 10:10:05 +09:00
Campbell Barton
d124bd1cd4
Spelling
2014-08-12 10:31:07 +10:00
Campbell Barton
afe8a4040f
Fix uninitialized memory use
2014-08-12 08:21:02 +10:00
Campbell Barton
0219cf468e
Fix marker selection margin ignoring DPI
2014-08-12 05:45:59 +10:00
Bastien Montagne
bd623d9da3
Fix T41403: Grid Particles only partially generated.
...
Getting dominant axis (biggest dimension of bbox) was wrong, now using BLI code for that.
2014-08-11 20:23:39 +02:00
Sergey Sharybin
8bed4e6040
Fix T41362: CPU and GPU rendering gives different results
...
We can't really make CPU and GPU results look the same in all possible
circumstances, but here we can make them look close enough to each other
by making it so sobol pattern for bounce number is the smae for both
CPU and GPU.
This makes CPU and GPU render results look the same with low number of
samples, high number of samples was never an issue.
2014-08-11 22:29:27 +06:00
Sergey Sharybin
3e41c8ad6f
Fix compilation error with debug scons
...
The issue is that we've got hell with DEBUG and _DEBUG,
theu're defined really inconsistent acros CMake and SCons.
Used more reliable NDEBUG definition for IDP_spit.
2014-08-11 20:58:42 +06:00
Sergey Sharybin
0fe70b5e28
Fix T41360: Crash on Boolean Modifier
...
The issue was caused by the wrong attributes maps in certain
circumstances after union intersections.
Namely issue might have happen when more than one iteration of
union was happening and it was caused by the fact that new faces
might be allocated on the same address as freed face from the
old mesh.
Didn't find a nicer fix for this apart from correcting the whole
attributes map after each union step.
We could try removing attributes for the meshes which are getting
deleted, but in asymptotic it's gonna to give exactly the same
complexity as the current approach.
2014-08-11 20:55:52 +06:00
