griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
67,849 Commits 1 Branch 0 Tags
fc61cdf1428dc74f4ef9b834de9082f910ce08e0
Commit Graph

54396 Commits

Author SHA1 Message Date
Sergey Sharybin
fc61cdf142 Merge branch 'master' into blender2.8 2017-03-16 15:42:49 +01:00
Sergey Sharybin
0434053f13 Depsgraph: Fixed crash with curve bevel indirect dupligroups 
Need to expand all object's dupli-groups, not only the dupli-groups
of objects directly linked to the scene.
 2017-03-16 15:35:21 +01:00
Sergey Sharybin
68e58f1991 Depsgraph: Use string and vector in the DEG namespace only 2017-03-16 15:35:21 +01:00
Sergey Sharybin
6d8875bd61 Depsgraph: Don't use explicit values in runtime only enum 
Lower risk of forgetting to update some values here.
 2017-03-16 15:35:21 +01:00
Campbell Barton
c4e07dd29b Cleanup: differentiate startup/prefs in home-file reading 2017-03-17 00:42:13 +11:00
Campbell Barton
aad9dd2f1b Support passing in UserDef for free function 
Needed so we can load and free non-global user preferences.
 2017-03-17 00:18:20 +11:00
Germano Cavalcante
dd3ae7bad7 OpenGL immediate mode: image_draw.c: Draw Sample Line with new imm mode 
part of T49043
 2017-03-16 10:15:01 -03:00
Bastien Montagne
d68a84d1d2 Fix BGE building. 
When you use typedef'ed enum, you need to define all supported values
explicitely in enum, else compiler goes grumpy...
 2017-03-16 10:30:02 +01:00
Germano Cavalcante
dd7b60c638 Adds missing immUnbindProgram() in image_draw 
This was interruping the execution of the code (To test: Just left click on the UV editing window to read the pixel)
 2017-03-16 01:13:18 -03:00
Mike Erwin
0fc4cf7637 OpenGL: draw navmesh with new imm mode 
This is an old stash. Part of DerivedMesh so the whole thing might be removed soon.

part of T49043
 2017-03-16 00:05:05 -04:00
Mike Erwin
0895550d24 OpenGL: more new imm mode for image_draw 
plus some minor cleanup

part of T49043
 2017-03-15 16:53:45 -04:00
Mike Erwin
c5f97dfe59 Gawain: bypass strict error checking for release builds 
Now that we're almost done with T49043, let's run immediate mode at full speed. Debug builds will still do strict checks.

Developers should still test their changes before committing! Recommended:
$ make debug (or make lite debug)
$ blender --debug-gpu
 2017-03-15 16:53:45 -04:00
Julian Eisel
0d0d68d39d Outliner: Don't show master collection itself in "Master Collection Tree" 
It would always be the only highest-level element in the tree, without
serving a real purpose. Even collapsing it wouldn't make much sense.
 2017-03-15 21:48:18 +01:00
Julian Eisel
a449214854 Outliner: Rename "All Collections" display mode to "Master Collection Tree" 
Also don't show alphabetical sorting option for "Active Render Layer" mode.
 2017-03-15 20:50:35 +01:00
Campbell Barton
375ede0f3f Comments: wmOperator.cancel & modal 2017-03-16 06:39:09 +11:00
Julian Eisel
209d4d6993 Merge branch 'master' into blender2.8 
Needed for compile fix.
 2017-03-15 20:28:23 +01:00
Campbell Barton
68496c0b38 Missed BGE in recent commit 2017-03-16 06:28:20 +11:00
Julian Eisel
7f596d39df Outliner: Change default display mode to "Active Layer" 
We concluded this is going to be the display mode users will need to work
with the most, so makes sense to make it the default one.
Also, if the opened file only has one collection in the active render
layer, we expand it (almost empty list would be misleading).

What I had to do to make the expanding work is a bit ugly, but didn't
find a better way. During do_version we don't have access to the
TreeElement instances, and including ED_outliner.h to share code here
should be avoided too.
 2017-03-15 20:14:26 +01:00
Campbell Barton
104a03beed Merge branch 'master' into blender2.8 2017-03-16 04:53:07 +11:00
Campbell Barton
c832354e33 Load user-preferences before startup file 
Internal change needed for template support.
Loading the user preferences first so it's possible
for preferences to control startup behavior.

In general it's useful to load preferences before data-files,
so we know security settings for eg.
 2017-03-16 04:02:24 +11:00
Mike Erwin
fce0ff0a31 OpenGL: remove non-GLSL option from basic shader 
This code path was only used when Blender was launched with --enable-legacy-basic-shader at the command line.

Part of general OpenGL upgrade (T49165)
 2017-03-15 11:53:48 -04:00
Julian Eisel
8892c7869e Fix "search for unknown operator 'WM_OT_window_duplicate'" warning 
Mistake in rB7bc76f8a3c1416.
 2017-03-15 16:03:01 +01:00
Dalai Felinto
81dc8dd42a Fix bug on Blender version string 
Reported by Pablo Vazquez (venomgfx) over irc.
 2017-03-15 15:42:01 +01:00
Sergey Sharybin
19b3b11c64 Immediate Mode: Fix text color in iuage info line 2017-03-15 15:04:41 +01:00
Sergey Sharybin
e016a29ba0 Blender 2.8: Always prefer Occlusion Queries when using AUTO selection mode 
GL_SELECT is really slow in this branch and will be removed.

For now we simply change AUTO behavior to avoid possible conflicts with merges
and upcoming color-id-based selection.
 2017-03-15 14:55:46 +01:00
Sergey Sharybin
6b720dffc9 Merge branch 'master' into blender2.8 2017-03-15 14:19:53 +01:00
Sergey Sharybin
6d71169478 De-duplictae fix for lasso with Dalai 
Git silently merged our both fixes together. Sure thing it's double safe this way, but cmon.
 2017-03-15 14:18:37 +01:00
Dalai Felinto
d78b1147be Layers: handle doversion naming differently 
Talked with Pablo Vazquez (venomgfx) and Julian Eisel (Severin), and we came up with this solution instead.

Basically, if the file has only one layer, it is converted to a collection named "Default Collection". Otherwise we name the collections: "Collection 1 [converted from 2.75]"
 2017-03-15 14:12:52 +01:00
Dalai Felinto
c6c85a8c6b Move Blender version string handling to its own function 
Planning to use this util function in 2.8 for doversioning (to communicate converted layers)
 2017-03-15 14:10:20 +01:00
Sergey Sharybin
c10fbc002b Correct assert failure in debug mode with lasso select 
Just do early output and don't bother with any GLSL program bind when
there is not enough points of lasso to draw.

This could have happened at the very beginning of the stroke.
 2017-03-15 14:04:03 +01:00
Dalai Felinto
c16796089c Remove commented out code from transform_snap.c 
Code was commented out in 2012 and it was not working even then. So it makes for an impossible conversion to the new gawain API.
 2017-03-15 13:57:52 +01:00
Dalai Felinto
32d90220c2 Remove commented out code from reeb.c 
Code was commented out in 2009
 2017-03-15 13:57:52 +01:00
Dalai Felinto
f274332bb3 Remove commented out code from pbvh.c 
Code was commented out in 2009
 2017-03-15 13:57:52 +01:00
Dalai Felinto
6d8a25920d Remove commented out code from editarmature_sketch.c 
Code was commented out in 2010
 2017-03-15 13:57:52 +01:00
Dalai Felinto
9f366aee3b Immediate Mode: update drawnode.c commented out debug code 
It works fine if you uncomment it, it shows a bigger circle around the re-route element, with a different color based on the selection state
 2017-03-15 13:57:52 +01:00
Dalai Felinto
e00f52aeab Fix crash on node editor when using lasso to remove nodes connections 2017-03-15 13:57:52 +01:00
Dalai Felinto
279bcd8492 Remove unused code from drawnode.c 
The code in question was marked as /* not used in 2.5x yet */.
 2017-03-15 13:57:52 +01:00
Dalai Felinto
c72d319b47 Immediate Mode: remove commented out code from drawgpencil.c 
Some of this was "tagged" for removal by Dec 2016.
 2017-03-15 13:57:52 +01:00
Sergey Sharybin
d4b3068f36 Use FTOCHAR rather than CLAMP of uchar output 
This makes no sense to clamp after value was assigned to uchar already.
Proper way to do so is to use FTOCHAR.
 2017-03-15 13:50:41 +01:00
Clément Foucault
407f8eed7d OpenGL: Converted gpu_compositing.c to use batches. 2017-03-15 13:17:49 +01:00
Sergey Sharybin
79f94674fb Merge branch 'master' into blender2.8 2017-03-15 12:48:48 +01:00
Sergey Sharybin
af1d9ecd40 Fix strict compiler warning in the previous commit 2017-03-15 12:48:07 +01:00
Sergey Sharybin
9ad252d157 Fix T50938: Cache not being reset when changing simulation settings with new depsgraph 
The thing i'm really starting to hate is the requirement to specify both
operation code and node type. Seems to be duplicated enums without real
need for that.
 2017-03-15 11:10:42 +01:00
Porteries Tristan
6a5487e021 BGE: Fix blenderplayer stub. 
Add dummy definition of WM_operator_is_repeat.
 2017-03-14 21:17:40 +00:00
Campbell Barton
1d5ba269c1 Merge branch 'master' into blender2.8 2017-03-15 06:04:52 +11:00
Campbell Barton
f13c729b26 WM: free operators when repeating 
Needed since the active operator isn't ensured to be the last.
 2017-03-15 05:37:42 +11:00
Gaia Clary
647fb6ef1e fix D2552: Collada - Follow up change to complete the fix in rBda6cd7762810 (use unique id for bones with same name in different armatures) 2017-03-14 19:31:25 +01:00
Gaia Clary
4877c9362a Collada simplify: avoid duplicate negation in boolean 2017-03-14 19:31:25 +01:00
Campbell Barton
76ec329dd1 WM: add Operator.is_repeat() check for C & Py 
This addresses an issue raised by D2453 -
that there was no way to check if operators are run
multiple times in a row.

Actions are still ignored that don't cause an UNDO event.
 2017-03-15 03:57:01 +11:00
Campbell Barton
1208792adb WM: store operators with undo flag 
This is needed so we can tell if operators are executed repeatedly.
 2017-03-15 03:57:01 +11:00