griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
55,329 Commits 1 Branch 0 Tags
fc85446c500fbe70515567e94122fc0d8746f3e5
Commit Graph

45154 Commits

Author SHA1 Message Date
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
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
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
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
Bastien Montagne
ce960028a4 Fix for previous commit - after talk with physics guys (Genscher, Miikah), better 
to keep soft UI limits as is, and only raise hard ones.
 2014-08-11 15:43:24 +02:00
Bastien Montagne
3225762049 Fix T40047: Smoke: Maximum value for initial velocity. 
Based on D644, by robschia (Roberto Schiavone).
 2014-08-11 15:23:36 +02:00
Bastien Montagne
c4814c8764 Fix T40203: Fluid simulation needs more memory than displayed. 
Nothing like a fix, actually, this is an issue in elbeem afaik.
For now, just warn user that complex obstacles may breack things.
 2014-08-11 15:02:57 +02:00
Sergey Sharybin
1ca8684911 Fix T40744: MIP Map is generating strange noise in texture, Blender Internal 2014-08-11 17:37:56 +06:00
Antony Riakiotakis
f8a39dad63 Minor cleanup 2014-08-11 11:55:16 +02:00
Antony Riakiotakis
028fd29eeb Pie Menus C code backend. 
This commit merges the code in the pie-menu branch.

As per decisions taken the last few days, there are no pie menus
included and there will be an official add-on including overrides of
some keys with pie menus. However, people will now be able to use the
new code in python.

Full Documentation is in http://wiki.blender.org/index.php/Dev:Ref/

Thanks:
Campbell Barton, Dalai Felinto and Ton Roosendaal for the code review
and design comments

Jonathan Williamson, Pawel Lyczkowski, Pablo Vazquez among others for
suggestions during the development.

Special Thanks to Sean Olson, for his support, suggestions, testing and
merciless bugging so that I would finish the pie menu code. Without him
we wouldn't be here. Also to the rest of the developers of the original
python add-on, Patrick Moore and Dan Eicher and finally to Matt Ebb, who
did the research and first implementation and whose code I used to get
started.
 2014-08-11 11:02:26 +02:00
Sergey Sharybin
5d1d23d5bd Fix T41395: Set Object As Camera - Monkey Render bug? 2014-08-11 14:12:09 +06:00
Campbell Barton
d4599ff001 Fix T40766: Startup fails with UnicodeDecodeError on Windows 2014-08-11 17:53:42 +10:00
Campbell Barton
eedc3834fe Comments 2014-08-11 13:36:35 +10:00
Campbell Barton
e233be5157 View3D: rotate around selection - uses boundbox center 2014-08-11 13:34:28 +10:00
Campbell Barton
44aa221600 Utility functions for getting boundbox size/scale 2014-08-11 13:25:25 +10:00
Campbell Barton
5ad353b6c2 Fix T41379: Drag n Drop .txt files text editor fails 
by kevindietrich
 2014-08-11 10:20:01 +10:00
Antony Riakiotakis
8e86c41c55 Fix T41385 
Pretty old bug, reset flag to not use color transform by default.
 2014-08-10 20:28:53 +02:00
Bastien Montagne
29e15926b1 Fix for rB3cd2c6145ae1. 
ID using EffectorWeight is not always a scene...
 2014-08-10 18:21:57 +02:00
Bastien Montagne
93ed779950 Minor tweak to own previous shapekey_move commit. 2014-08-10 17:30:07 +02:00
Bastien Montagne
3cd2c6145a Fix T41295: Rigid bodyfield weights not working.?? 
Looks like `rna_EffectorWeight_update()` was not really working, now uses same kind of code
as `rna_Physics_update()` from rna_scene.c.
 2014-08-10 15:39:30 +02:00
Bastien Montagne
7284e6aedd Fix T41381: Moving shapes keys up/down, after last, they don't go to first (as Vertex Group). 
Was more a feature request actually, but anyway...

Note this is a bit more complex than it's vgroups counterpart, since we have to handle
relations between keys (relative keys, and position for absolute ones).
 2014-08-10 11:40:35 +02:00
Benoit Bolsee
8aa203abc1 BGE: fix a bug causing frequent crash on scene restart with navmesh. 2014-08-10 00:40:15 +02:00
Bastien Montagne
64c7b2a122 UI: show ttips even if disabled, when holding alt key. 
Patch by @sambler (Shane Ambler), with minor edits by myself (see also D727, T24055).
Reviewed feature-side by @carter2422 (Jonathan Williamson).
 2014-08-09 22:04:55 +02:00
gaiaclary
71323f0425 Intensity and color are now adjusted upon import to get correct values 2014-08-09 20:50:35 +02:00
Benoit Bolsee
afce1057fd BGE: Fix bug with Steering Actuator Python API. 
It was not possible to set the navmesh attribute from Python due to a double bug.
 2014-08-09 17:19:13 +02:00
Benoit Bolsee
de04c921b0 Fix to get iTaSC working again in the BGE 2014-08-09 15:46:26 +02:00
Antony Riakiotakis
ee8dafe462 Fix crash on edit mode with multi-align project 2014-08-08 19:35:09 +02:00
Campbell Barton
9fb157df50 BGE: move macro body into a function to reduce code-size 2014-08-08 14:46:11 +10:00
Campbell Barton
d2c350b0a4 Quiet reorder warning 2014-08-08 14:45:38 +10:00
Sergey Sharybin
9a8e889dfc Fix T41173: CM view selection is difficult with multiple views 
Use drop-down menu instead of expanded enum for the view select.
There are usually more views than displays and using drop-down
for display device and expanded enum for view is kindof strange.
 2014-08-08 01:30:22 +06:00
Campbell Barton
e1819cc918 Fix T40948: Fill holes fails in certain case 2014-08-08 04:30:24 +10:00
Sergey Sharybin
57c4871146 Tweaks to the recent wrapper on windows 
- Forgot to handle command line arguments

- Because of the fact we need to be able to
  use stdout and stderr we need to use regular
  console application for the wrapper.

- Because of using regular application for the
  wrapper we need to check forparent PID in the
  isStartedFromCommandPrompt().

I really hope it's not gonna to become any more
complicated.
 2014-08-08 00:22:57 +06:00
Campbell Barton
a108532eb9 Fix for mathutils.Euler on big endian systems 
D719 from jrestemeier with edits
 2014-08-08 02:11:54 +10:00
Campbell Barton
29eb567288 Cleanup: unused defines 2014-08-08 02:11:54 +10:00