griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
68,989 Commits 1 Branch 0 Tags
54bde8244578fc2002efa394b482ff3ff47f43fd
Commit Graph

12441 Commits

Author SHA1 Message Date
Dalai Felinto
2a86082945 Validate collection properties at readile 
The alternative would be to do version bump + doversioning every
time a new property is added.
 2017-05-03 11:51:49 +02:00
Dalai Felinto
66c74242bb Make IDP_MergeGroup recursive 
With this we also do not need IDP_MergeGroupValues anymore.
If this causes problems in the future we can always make recursion an
option (like overwrite is).
 2017-05-03 11:51:49 +02:00
Bastien Montagne
d116932f3a Add BBone and Wire Armature draw types to DrawManager. 
Most of this was copying/adapting code from octahedral existing draw
code, tough part was to get BBone matrices to behave as expected, they
are using a fairly specific setup...

Addresses T51365 and T51362.
 2017-05-03 08:37:24 +02:00
Campbell Barton
2b0f02057f Draw Manager: split DRW_draw_view into 2 functions 
Needed for offscreen render
 2017-05-03 00:45:10 +10:00
Dalai Felinto
8c660c7801 Cycles integration with Draw Manager 
We can now use object and other modes on top of Cycles.
Since we are now always on "render_to_view" (old Rendered mode), the
pause button is always visible.
 2017-05-02 15:13:50 +02:00
Dalai Felinto
d5acf4f467 Fix for issue when duplicating text objects 
The crash happens with Cycles and Font objects if we get Cycles working
with draw manager.
 2017-05-01 16:48:09 +02:00
Mike Erwin
a49708a691 OpenGL: stop using GL_NORMALIZE 
With GLSL there is no need for GL_NORMALIZE. We explicitly normalize in the shader, or (better) send in unit vectors.

Part of T51164
 2017-04-27 10:35:12 -04:00
Campbell Barton
c9d4a0930b Merge branch 'master' into 28 2017-04-27 00:58:28 +10:00
Sybren A. Stüvel
dc27d31a21 Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8 
# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
 2017-04-26 16:50:29 +02:00
Sergey Sharybin
e6954a5a7c Fix race condition invalidating object data's bounding box 2017-04-26 16:00:02 +02:00
Sybren A. Stüvel
20621d46d1 Alembic: fixed refcount issue when duplicating imported objects 
Duplicating an imported object didn't increment the cache reader's refcount,
whereas removing the duplicate did decrement it. This caused problems.
 2017-04-26 15:19:37 +02:00
Sybren A. Stüvel
ff1f115706 Fix T51280: Alembic: Crash when removing cache modifier 
The calls to id_us_plus/min were unnecessary (and caused assertion
failures) as this is already taken care of by transformcache_id_looper().
 2017-04-26 15:19:37 +02:00
Sybren A. Stüvel
99d2d6f387 Alembic import: don't use global main 2017-04-25 17:03:15 +02:00
Sybren A. Stüvel
2aa4f8ab92 Alembic import: removed BaseLegacy from BKE_cachefile_clean 
Now we just iterate over all objects. It may be a better idea to use a
smarter approach for performance. However, since this function is not
called regularly (only when changing Alembic file paths), it's not a very
big deal.
 2017-04-25 16:59:36 +02:00
Dalai Felinto
0f143627d2 Collection: __FUNCTION__ > __func__ 2017-04-24 18:15:37 +02:00
Dalai Felinto
9f074444ad Layer cleanup: Rename _Iterator_ > _iterator_ 2017-04-24 18:14:41 +02:00
Dalai Felinto
1ffdffc699 FOREACH_SELECTED_BASE iterator 2017-04-24 18:06:48 +02:00
Luca Rood
2f2e2bae8d Fix own mistake in smoke.c 2017-04-24 17:15:17 +02:00
Luca Rood
913e9350a5 Convert BaseLegacy to Base (part) 2017-04-24 16:09:04 +02:00
Campbell Barton
2010dbe8a5 Merge branch 'master' into blender2.8 2017-04-24 22:11:05 +10:00
Campbell Barton
aff30aaf2d Cleanup: style 2017-04-24 22:00:46 +10:00
Dalai Felinto
19548040d9 Fix T51261: New objects aren't selected 
The original code was failing because the base to object flushing was
only happening as part of the depsgraph. However we can use the
evaluated values to set the initial values of the base.

In this particular case, we couldn't set the new object visible because
its selectability flag was not set yet.
 2017-04-21 15:27:32 +02:00
Sybren A. Stüvel
81011679dd Merge branch 'master' into blender2.8 2017-04-21 14:19:05 +02:00
Sybren A. Stüvel
9c02990ac1 Alembic import: changing cache modifier path no longer discards object paths 
This allows, for example, the path of an Alembic file to be changed from
absolute to relative, without having to reconstruct all object paths.
 2017-04-21 14:11:49 +02:00
Sybren A. Stüvel
9d819775b7 Alembic: properly initialising cachefile object paths list. 2017-04-21 14:11:49 +02:00
Campbell Barton
bfa888cef2 Cleanup: move draw-cache creation from BKE to DRW 
Creating draw-cache should only ever be used by the draw-manager.
 2017-04-21 22:06:06 +10:00
Campbell Barton
3540b50780 Cleanup: use id-property access macros 2017-04-21 19:47:01 +10:00
Dalai Felinto
6294bd1b8b Depsgraph: Move DAG_get_object function 
BKE_depsgraph.h will be deprecated eventually, so moving it to DEG_depsgraph_query.h
 2017-04-21 11:33:15 +02:00
Campbell Barton
3a75e84376 Draw Manager: edit-mode 3d text drawing 
Draw cursor and selection, also support for fast-display.
 2017-04-21 17:58:18 +10:00
Campbell Barton
2b9738b7f8 Merge branch 'master' into 28 2017-04-21 17:14:13 +10:00
Campbell Barton
13ee5ba467 Store edit-font select-box length 
A little awkward to calculate when drawing.
 2017-04-21 17:12:43 +10:00
Campbell Barton
677aa36632 Curve: draw curve/surface/text geometry 
Note that displists will be removed, but this wont be hard to replace.

Signed-off-by: Campbell Barton <ideasman42@gmail.com>
 2017-04-21 04:23:28 +10:00
Luca Rood
ee3faddfaa Fix T45350: Cache not being recomputed with "Bake All Dynamics" 2017-04-20 15:01:21 +02:00
Campbell Barton
6028ff2736 Correct error drawing curve normals 2017-04-20 21:01:23 +10:00
Dalai Felinto
913472165b Fix T51215: depsgraph evaluation of collection properties (overrides) 2017-04-20 11:00:32 +02:00
Dalai Felinto
3cb0e8e1af IDProperty: New util function to merge groups recursively 2017-04-20 11:00:32 +02:00
Campbell Barton
09bf8f4a69 Use reflect for calculating second normal 2017-04-20 18:56:53 +10:00
Campbell Barton
462d9e37ea Cleanup: remove type prefix from render-data vars 
Render data is never mixed with other object types,
no need to make a distinction.
 2017-04-20 16:25:20 +10:00
Bastien Montagne
6a5b53fe6f Merge branch 'master' into blender2.8 2017-04-19 22:11:53 +02:00
Campbell Barton
a738e985c6 Fix update drawing curve editmode 2017-04-20 05:55:48 +10:00
Bastien Montagne
1c28e12414 Fix (unreported) missing handling of GPencil Layer's parent Object pointer in BKE_library_query. 
Grrrr... still finding missing pointers here... :/
 2017-04-19 21:47:01 +02:00
Campbell Barton
72efee07ff Draw Manager: draw curve normals 2017-04-20 05:33:52 +10:00
Campbell Barton
e28a92bacb Cleanup: put overlay & wire in own structs 2017-04-20 02:53:33 +10:00
Campbell Barton
cdba73c8fa Draw Manager: curve support 
Draws the curve centerline and editmode verts/handles.

Handle theme colors, and normal display still need adding.
 2017-04-20 00:38:44 +10:00
Campbell Barton
72fc837d1e Cleanup: replace num/ct/tot with 'len' 2017-04-19 01:04:42 +10:00
Dalai Felinto
c9d78b6c43 Merge remote-tracking branch 'origin/master' into blender2.8 2017-04-18 16:30:13 +02:00
Dalai Felinto
bc6a75b405 Revert "Object Info node support for GLSL mode and the internal render" 
This reverts commit 76425feed8.

** Note **
This was supposed to be a merge, but it was rebased.
 2017-04-18 16:29:42 +02:00
Campbell Barton
b8fd6f94a0 Cleanup: replace num/ct/tot with 'len' 2017-04-19 00:12:12 +10:00
Alexander Romanov
76425feed8 Object Info node support for GLSL mode and the internal render 
Object Info node can be useful to give some variation to a single material assigned to multiple instances. This patch adds support for Viewport and BI.

{F499530}

Example: {F499528}

Reviewers: merwin, brecht, dfelinto

Reviewed By: brecht

Subscribers: duarteframos, fclem, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D2425
 2017-04-18 15:37:22 +02:00
Campbell Barton
8fdd568343 Draw Manager: T51218 Support edit-mesh hide 2017-04-18 23:33:50 +10:00