blender.git
2 years agoMerge remote-tracking branch 'origin/clay-engine' into render-layers
Dalai Felinto [Fri, 3 Feb 2017 16:22:51 +0000 (17:22 +0100)]
Merge remote-tracking branch 'origin/clay-engine' into render-layers

2 years agoUI: use the "USE" flag for collection settings
Dalai Felinto [Fri, 3 Feb 2017 15:15:49 +0000 (16:15 +0100)]
UI: use the "USE" flag for collection settings

Note, this should be a proper uiTemplate, but a pure python approach seems to work fine for now

2 years agoRNA: macros to wrap collection settings use
Dalai Felinto [Fri, 3 Feb 2017 15:15:10 +0000 (16:15 +0100)]
RNA: macros to wrap collection settings use

2 years agolayer: getter/setter for USE flag
Dalai Felinto [Fri, 3 Feb 2017 15:14:23 +0000 (16:14 +0100)]
layer: getter/setter for USE flag

2 years agoUpdate collection engine setings when updating collection values
Dalai Felinto [Fri, 3 Feb 2017 14:17:09 +0000 (15:17 +0100)]
Update collection engine setings when updating collection values

2 years agoPlaceholder for depsgraph evaluation of collection engine settings
Dalai Felinto [Fri, 3 Feb 2017 14:19:01 +0000 (15:19 +0100)]
Placeholder for depsgraph evaluation of collection engine settings

2 years agoFix bplayer (c)
Bastien Montagne [Fri, 3 Feb 2017 14:18:13 +0000 (15:18 +0100)]
Fix bplayer (c)

2 years agoRNA: use new getter/setter functions for LayerEngineSettings
Dalai Felinto [Fri, 3 Feb 2017 14:06:11 +0000 (15:06 +0100)]
RNA: use new getter/setter functions for LayerEngineSettings

2 years agoFixup for rB6cdb3845 (Added collection props getter/setter)
Dalai Felinto [Fri, 3 Feb 2017 13:44:08 +0000 (14:44 +0100)]
Fixup for rB6cdb3845 (Added collection props getter/setter)

2 years agoFix warnings
Clément Foucault [Fri, 3 Feb 2017 13:52:33 +0000 (14:52 +0100)]
Fix warnings

2 years agoNew CMake flag for Clay Engine
Clément Foucault [Fri, 3 Feb 2017 13:38:11 +0000 (14:38 +0100)]
New CMake flag for Clay Engine

2 years agoFix hang infinite loop
Clément Foucault [Fri, 3 Feb 2017 13:37:50 +0000 (14:37 +0100)]
Fix hang infinite loop

2 years agoGet rid of runtime data struct.
Clément Foucault [Fri, 3 Feb 2017 12:00:15 +0000 (13:00 +0100)]
Get rid of runtime data struct.

2 years agoAdded collection settings getter/setter
Clément Foucault [Fri, 3 Feb 2017 11:51:22 +0000 (12:51 +0100)]
Added collection settings getter/setter

2 years agoChange settings order
Clément Foucault [Fri, 3 Feb 2017 11:47:45 +0000 (12:47 +0100)]
Change settings order

2 years agoFix new objects are invisible
Dalai Felinto [Fri, 3 Feb 2017 11:46:47 +0000 (12:46 +0100)]
Fix new objects are invisible

2 years agoSet COLLECTION_PROP_USE when setting a layer_engine_settings property
Dalai Felinto [Fri, 3 Feb 2017 11:07:55 +0000 (12:07 +0100)]
Set COLLECTION_PROP_USE when setting a layer_engine_settings property

We still need depsgraph to evaluate those changes

2 years agoUtil function to create CollectionEngineSettings
Dalai Felinto [Fri, 3 Feb 2017 11:06:46 +0000 (12:06 +0100)]
Util function to create CollectionEngineSettings

This may be run by Depsgraph, as well as internal layercollection create routines

2 years agoUtil function to free CollectionEngineSettings
Dalai Felinto [Fri, 3 Feb 2017 10:56:59 +0000 (11:56 +0100)]
Util function to free CollectionEngineSettings

This may be run by Depsgraph, as well as internal layercollection free routines

2 years agoFix storage of CollectionSettings in DNA_object_types.h
Dalai Felinto [Fri, 3 Feb 2017 10:49:18 +0000 (11:49 +0100)]
Fix storage of CollectionSettings in DNA_object_types.h

2 years agoRemove unused enum values (COLLECTION_PROP_TYPE_POINTER/BOOL)
Dalai Felinto [Thu, 2 Feb 2017 16:42:32 +0000 (17:42 +0100)]
Remove unused enum values (COLLECTION_PROP_TYPE_POINTER/BOOL)

2 years agoFix return in BKE_scene_layer_find_from_collection
Dalai Felinto [Fri, 3 Feb 2017 09:51:13 +0000 (10:51 +0100)]
Fix return in BKE_scene_layer_find_from_collection

2 years agoMore lamp work
Clément Foucault [Thu, 2 Feb 2017 21:19:23 +0000 (22:19 +0100)]
More lamp work

2 years agoUse vec2 for screen space stuff
Clément Foucault [Thu, 2 Feb 2017 20:44:14 +0000 (21:44 +0100)]
Use vec2 for screen space stuff

2 years agoLamp sunrays and shadow circles
Clément Foucault [Thu, 2 Feb 2017 20:39:58 +0000 (21:39 +0100)]
Lamp sunrays and shadow circles

2 years agoBring back the select button for the UI
Dalai Felinto [Thu, 2 Feb 2017 17:06:24 +0000 (18:06 +0100)]
Bring back the select button for the UI

2 years agoFix unfreed memory
Clément Foucault [Thu, 2 Feb 2017 16:15:26 +0000 (17:15 +0100)]
Fix unfreed memory

2 years agoFix warnings
Clément Foucault [Thu, 2 Feb 2017 16:03:21 +0000 (17:03 +0100)]
Fix warnings

2 years agoFix depth not cleared
Clément Foucault [Thu, 2 Feb 2017 15:54:34 +0000 (16:54 +0100)]
Fix depth not cleared

2 years agoBypass wires.
Clément Foucault [Thu, 2 Feb 2017 15:54:15 +0000 (16:54 +0100)]
Bypass wires.

2 years agoFix ogl warnings.
Clément Foucault [Thu, 2 Feb 2017 15:28:16 +0000 (16:28 +0100)]
Fix ogl warnings.

2 years agoFix assert
Clément Foucault [Thu, 2 Feb 2017 15:23:21 +0000 (16:23 +0100)]
Fix assert

2 years agoAdded Lamp screen space visual
Clément Foucault [Thu, 2 Feb 2017 13:17:29 +0000 (14:17 +0100)]
Added Lamp screen space visual

2 years agoStart of Lamp drawing
Clément Foucault [Wed, 1 Feb 2017 23:41:54 +0000 (00:41 +0100)]
Start of Lamp drawing

2 years agoGroundline/GroundPoint shader for lights
Clément Foucault [Wed, 1 Feb 2017 23:41:14 +0000 (00:41 +0100)]
Groundline/GroundPoint shader for lights

2 years agoClay Engine per-collection settings
Dalai Felinto [Thu, 2 Feb 2017 10:08:21 +0000 (11:08 +0100)]
Clay Engine per-collection settings

Note: this is still not used by rendering

2 years agoIntroduce Per-Collection Render settings
Dalai Felinto [Thu, 2 Feb 2017 10:04:01 +0000 (11:04 +0100)]
Introduce Per-Collection Render settings

Pending:

* UI template for those settings (showing USE)
* Depsgraph evaluation of them (to flush into objects)
* RNA to see if a settings is being used

2 years agoFixing Memory Leak
Clément Foucault [Wed, 1 Feb 2017 13:32:48 +0000 (14:32 +0100)]
Fixing Memory Leak

2 years agoImplemented All Empties type drawing
Clément Foucault [Wed, 1 Feb 2017 12:58:10 +0000 (13:58 +0100)]
Implemented All Empties type drawing

2 years agoSilence more warnings
Dalai Felinto [Wed, 1 Feb 2017 10:59:54 +0000 (11:59 +0100)]
Silence more warnings

This should silence the current warnings, and gives us real warnings if
the bContext data is tampered with.

2 years agoSilence warning
Dalai Felinto [Wed, 1 Feb 2017 10:46:55 +0000 (11:46 +0100)]
Silence warning

There is still a warning because of `DST.context = C;` which discards
'const' qualifier. I find this a legit problem, I suspect we are not
suppose to store bContext at all.

2 years agoGiving Overlay Edges a try
Clément Foucault [Tue, 31 Jan 2017 23:28:16 +0000 (00:28 +0100)]
Giving Overlay Edges a try

2 years agoCode cleanup
Clément Foucault [Tue, 31 Jan 2017 16:27:19 +0000 (17:27 +0100)]
Code cleanup

2 years agoAdded wire outlines
Clément Foucault [Tue, 31 Jan 2017 16:27:05 +0000 (17:27 +0100)]
Added wire outlines

2 years agoCode Cleanup
Clément Foucault [Tue, 31 Jan 2017 15:15:06 +0000 (16:15 +0100)]
Code Cleanup

2 years agoUse new temporary depsgraph
Dalai Felinto [Tue, 31 Jan 2017 14:21:40 +0000 (15:21 +0100)]
Use new temporary depsgraph

The idea is to use only Object, never Base

2 years agoRemove unused function (silence warning)
Dalai Felinto [Tue, 31 Jan 2017 14:20:40 +0000 (15:20 +0100)]
Remove unused function (silence warning)

2 years agoMerge branch 'render-layers' into clay-engine
Dalai Felinto [Tue, 31 Jan 2017 14:06:51 +0000 (15:06 +0100)]
Merge branch 'render-layers' into clay-engine

2 years agoDepsgraph hack: DEG_OBJECT_ITER and base_flag
Dalai Felinto [Tue, 31 Jan 2017 13:52:46 +0000 (14:52 +0100)]
Depsgraph hack: DEG_OBJECT_ITER and base_flag

This is a temporary iterator that flushes the base flag to the object

2 years agoMerge branch 'render-layers' of git.blender.org:blender into clay-engine
Clément Foucault [Tue, 31 Jan 2017 13:03:00 +0000 (14:03 +0100)]
Merge branch 'render-layers' of git.blender.org:blender into clay-engine

2 years agoMore Object mode work.
Clément Foucault [Tue, 31 Jan 2017 13:01:23 +0000 (14:01 +0100)]
More Object mode work.

2 years agoUI: temporary panels for layer/collections
Dalai Felinto [Tue, 31 Jan 2017 12:06:26 +0000 (13:06 +0100)]
UI: temporary panels for layer/collections

2 years agobpy.ops.collections.* accessible outside collection editor
Dalai Felinto [Tue, 31 Jan 2017 12:05:02 +0000 (13:05 +0100)]
bpy.ops.collections.* accessible outside collection editor

2 years agobpy.ops.collections.select()
Dalai Felinto [Tue, 31 Jan 2017 12:03:53 +0000 (13:03 +0100)]
bpy.ops.collections.select()

When we introduce overrides we will extend it to have override_index,
and if it is -1, only set the collection

2 years agobpy.ops.collections.collection_new()
Dalai Felinto [Tue, 31 Jan 2017 12:03:31 +0000 (13:03 +0100)]
bpy.ops.collections.collection_new()

2 years agoRemove old layers bitflag from viewport 3d header template
Dalai Felinto [Tue, 31 Jan 2017 10:46:02 +0000 (11:46 +0100)]
Remove old layers bitflag from viewport 3d header template

2 years agoLet scene_collection and layer_collection to have the same fallback
Dalai Felinto [Tue, 31 Jan 2017 10:45:09 +0000 (11:45 +0100)]
Let scene_collection and layer_collection to have the same fallback

2 years agoInitial implementation of instancing
Clément Foucault [Tue, 31 Jan 2017 01:12:24 +0000 (02:12 +0100)]
Initial implementation of instancing

2 years agoShow Render Layer panel to clay engine.
Clément Foucault [Mon, 30 Jan 2017 15:31:10 +0000 (16:31 +0100)]
Show Render Layer panel to clay engine.

2 years agoAdd icon to collection panel
Dalai Felinto [Tue, 31 Jan 2017 09:52:09 +0000 (10:52 +0100)]
Add icon to collection panel

2 years agoFix logic for bpy.context.scene_collection
Dalai Felinto [Tue, 31 Jan 2017 09:46:06 +0000 (10:46 +0100)]
Fix logic for bpy.context.scene_collection

2 years agoUnittest: refresh blender between tests
Dalai Felinto [Tue, 31 Jan 2017 09:14:46 +0000 (10:14 +0100)]
Unittest: refresh blender between tests

2 years agoMesh batch caches should not be stored in file
Dalai Felinto [Fri, 27 Jan 2017 14:21:14 +0000 (15:21 +0100)]
Mesh batch caches should not be stored in file

2 years agoProperties Editor: Collection context
Dalai Felinto [Mon, 30 Jan 2017 17:24:33 +0000 (18:24 +0100)]
Properties Editor: Collection context

2 years agoCollections Editor: populate header with operators
Dalai Felinto [Mon, 30 Jan 2017 17:23:51 +0000 (18:23 +0100)]
Collections Editor: populate header with operators

2 years agoSceneCollection.objects.active_index (for user interface)
Dalai Felinto [Mon, 30 Jan 2017 17:23:05 +0000 (18:23 +0100)]
SceneCollection.objects.active_index (for user interface)

2 years agoCollection related operators barebones
Dalai Felinto [Mon, 30 Jan 2017 17:10:12 +0000 (18:10 +0100)]
Collection related operators barebones

Those are the operators for the collections editor, and the collection property panel

2 years agoRNA: collection override
Dalai Felinto [Mon, 30 Jan 2017 17:07:38 +0000 (18:07 +0100)]
RNA: collection override

2 years agobpy.context.layer_collection
Dalai Felinto [Mon, 30 Jan 2017 17:07:14 +0000 (18:07 +0100)]
bpy.context.layer_collection

2 years agoFixed unfreed memory
Clément Foucault [Mon, 30 Jan 2017 14:35:12 +0000 (15:35 +0100)]
Fixed unfreed memory

2 years agoFix crash on read file
Clément Foucault [Mon, 30 Jan 2017 14:17:03 +0000 (15:17 +0100)]
Fix crash on read file

2 years agoFixed Pointer problem. Now materials are working.
Clément Foucault [Mon, 30 Jan 2017 14:09:35 +0000 (15:09 +0100)]
Fixed Pointer problem. Now materials are working.

2 years agoAdded scene.active_engine_settings
Clément Foucault [Mon, 30 Jan 2017 13:41:58 +0000 (14:41 +0100)]
Added scene.active_engine_settings

2 years agoCollection Editor based on patch by Julian Eisel
Dalai Felinto [Mon, 30 Jan 2017 13:14:27 +0000 (14:14 +0100)]
Collection Editor based on patch by Julian Eisel

This is extracted from the layer-manager branch. With the following
changes:

* Renamed references of layer manager to collections manager
* I didn't include the editors/space_collections/ draw and util files.

I still need to bring the drawing code here, so we see something.

2 years agoLayers: allow anonymous collection, and set active collection when linking it
Dalai Felinto [Mon, 30 Jan 2017 13:14:52 +0000 (14:14 +0100)]
Layers: allow anonymous collection, and set active collection when linking it

2 years agoFixed Engine name length
Clément Foucault [Mon, 30 Jan 2017 12:03:30 +0000 (13:03 +0100)]
Fixed Engine name length

2 years agoFix read/writefile.c
Clément Foucault [Mon, 30 Jan 2017 11:19:51 +0000 (12:19 +0100)]
Fix read/writefile.c

2 years agoChanges to DNA/RNA. Follow same layout as sensors.
Clément Foucault [Mon, 30 Jan 2017 01:24:18 +0000 (02:24 +0100)]
Changes to DNA/RNA. Follow same layout as sensors.

2 years agoChange in DNA/RNA. Still missing freeing and read/write.
Clément Foucault [Sat, 28 Jan 2017 23:55:46 +0000 (00:55 +0100)]
Change in DNA/RNA. Still missing freeing and read/write.

2 years agoAdded switch to test viewport cache
Clément Foucault [Fri, 27 Jan 2017 11:44:41 +0000 (12:44 +0100)]
Added switch to test viewport cache

2 years agoTemporarily prevent crash on edit mode
Dalai Felinto [Fri, 27 Jan 2017 14:20:19 +0000 (15:20 +0100)]
Temporarily prevent crash on edit mode

2 years agoMerge remote-tracking branch 'origin/render-layers' into clay-engine
Dalai Felinto [Fri, 27 Jan 2017 11:46:39 +0000 (12:46 +0100)]
Merge remote-tracking branch 'origin/render-layers' into clay-engine

2 years agoIntroduce Dynamic Batches + Relationship lines + Clear some matrix warnings
Clément Foucault [Fri, 27 Jan 2017 10:18:16 +0000 (11:18 +0100)]
Introduce Dynamic Batches + Relationship lines + Clear some matrix warnings

2 years agoMerge branch 'render-layers' of git.blender.org:blender into clay-engine
Clément Foucault [Thu, 26 Jan 2017 18:49:09 +0000 (19:49 +0100)]
Merge branch 'render-layers' of git.blender.org:blender into clay-engine

# Conflicts:
# source/blender/makesdna/DNA_scene_types.h

2 years agoMerge remote-tracking branch 'origin/blender2.8' into render-layers
Dalai Felinto [Thu, 26 Jan 2017 18:17:22 +0000 (19:17 +0100)]
Merge remote-tracking branch 'origin/blender2.8' into render-layers

Note:

renamed blo_do_versions_after_linking_280 to do_versions_after_linking_280 to following the pattern of do_versions_after_linking_270

2 years agoMesh batch caches update from depsgraph
Dalai Felinto [Thu, 26 Jan 2017 18:08:27 +0000 (19:08 +0100)]
Mesh batch caches update from depsgraph

We no longer need to rely on Derived mesh flag since the mesh is
properly flushed from the depsgraph

2 years agoDepsgraph: mesh cache depends needs updates when geometry changes (patch by Sergey...
Dalai Felinto [Thu, 26 Jan 2017 18:06:17 +0000 (19:06 +0100)]
Depsgraph: mesh cache depends needs updates when geometry changes (patch by Sergey Sharybin)

2 years agoFix blenderplayer build
Dalai Felinto [Thu, 26 Jan 2017 18:01:49 +0000 (19:01 +0100)]
Fix blenderplayer build

2 years agoUse the ultimate depsgraph callback function
Dalai Felinto [Thu, 26 Jan 2017 17:56:52 +0000 (18:56 +0100)]
Use the ultimate depsgraph callback function

Note: when in edit mode this depsgraph update is not being called. We are using DerivedMesh in those cases, so it is fine. I would like to investigate this though

2 years agoFix include compilation error on MSVC 2015.
Clément Foucault [Thu, 26 Jan 2017 17:51:22 +0000 (18:51 +0100)]
Fix include compilation error on MSVC 2015.

2 years agoFix compilation error on windows
Clément Foucault [Thu, 26 Jan 2017 17:33:24 +0000 (18:33 +0100)]
Fix compilation error on windows

2 years agoFixup for selected_objects context
Dalai Felinto [Thu, 26 Jan 2017 17:27:30 +0000 (18:27 +0100)]
Fixup for selected_objects context

This was making crash happen for any operation :/ shame on me

2 years agoFixup in doversioning
Dalai Felinto [Thu, 26 Jan 2017 17:25:08 +0000 (18:25 +0100)]
Fixup in doversioning

2 years agoDepsgraph: Add placeholder function to handle objects update
Sergey Sharybin [Thu, 26 Jan 2017 16:24:57 +0000 (17:24 +0100)]
Depsgraph: Add placeholder function to handle objects update

This way @dfelinto can do some special trickery in there.

2 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Thu, 26 Jan 2017 16:23:33 +0000 (17:23 +0100)]
Merge branch 'master' into blender2.8

2 years agoDepsgraph: Fix typo in assert
Sergey Sharybin [Thu, 26 Jan 2017 16:22:54 +0000 (17:22 +0100)]
Depsgraph: Fix typo in assert

2 years agoBlender 2.8: Apparently auto-merge worked incorrect in the merge commit
Sergey Sharybin [Thu, 26 Jan 2017 16:04:25 +0000 (17:04 +0100)]
Blender 2.8: Apparently auto-merge worked incorrect in the merge commit

2 years agoMerge branch 'master' into blender2.8
Sergey Sharybin [Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)]
Merge branch 'master' into blender2.8

2 years agoDepsgraph: Link from material to object shading
Sergey Sharybin [Thu, 26 Jan 2017 16:01:37 +0000 (17:01 +0100)]
Depsgraph: Link from material to object shading

This is a ground work for the upcoming changes in Blender 2.8 branch
where we need to do special actions to reconstruct shaders when
material changes.

2 years agoDepsgraph: Add relation from node tree to material it's coming from
Sergey Sharybin [Thu, 26 Jan 2017 15:49:24 +0000 (16:49 +0100)]
Depsgraph: Add relation from node tree to material it's coming from